diff --git a/ChangeLog b/ChangeLog
index 7d4448532..84d2063cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-09-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoGCSFolder.m (-lookupName:inContext:acquire:):
+	instanciated objects may be queried twice during the same session,
+	before being saved into the database. Therefore we cache them to
+	avoid losing their version number.
+
 	* UI/WebServerResources/AdministrationUI.js,
 	UI/WebServerResources/ContactsUI.js,
 	UI/WebServerResources/MailerUI.js,
diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index ea276d269..817d151ad 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -62,6 +62,7 @@
 #import "NSString+DAV.h"
 
 #import "DOMNode+SOGo.h"
+#import "SOGoCache.h"
 #import "SOGoContentObject.h"
 #import "SOGoGroup.h"
 #import "SOGoParentFolder.h"
@@ -591,6 +592,10 @@ static NSArray *childRecordFields = nil;
 	      [obj setIsNew: YES];
 	    }
 	}
+
+      if (obj)
+	[[SOGoCache sharedCache]
+          registerObject: obj withName: key inContainer: self];
     }
 
   return obj;