diff --git a/ChangeLog b/ChangeLog
index f50277721..acf8c0103 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2011-02-24  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Contacts/SOGoContactGCSEntry.m
+	(-saveContentString:baseVersion:): release the "card" ivar to
+	avoid caching issues.
+
+	* SoObjects/Appointments/SOGoTaskObject.m
+	(-saveContentString:baseVersion:): same as below.
+
+	* SoObjects/Appointments/SOGoAppointmentObject.m
+	(-saveComponent:): release fullCalendar, safeCalendar and
+	originalCalendar after modification to avoid caching issues.
+
 	* SoObjects/SOGo/SOGoContentObject.m (-davContentLength): return 0
 	when "content" is nil to avoid a value of "(nil)".
 	(-setMAPIContent:, -MAPIContent): removed obsolete methods (fixed
diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 3583d0fd7..c255dc3ef 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -594,6 +594,13 @@
 	  [super saveComponent: newEvent];
 	}
     }
+
+  [fullCalendar release];
+  fullCalendar = nil;
+  [safeCalendar release];
+  safeCalendar = nil;
+  [originalCalendar release];
+  originalCalendar = nil;
 }
 
 //
diff --git a/SoObjects/Appointments/SOGoTaskObject.m b/SoObjects/Appointments/SOGoTaskObject.m
index 529ddcb9f..3749e17e1 100644
--- a/SoObjects/Appointments/SOGoTaskObject.m
+++ b/SoObjects/Appointments/SOGoTaskObject.m
@@ -56,4 +56,22 @@
 			    inContainer: self];
 }
 
+#warning this code should be put in SOGoCalendarComponent once the UID hack\
+  in SOGoAppointmentObject is resolved
+- (NSException *) saveContentString: (NSString *) newContent
+                        baseVersion: (unsigned int) newVersion
+{
+  NSException *ex;
+
+  ex = [super saveContentString: newContent baseVersion: newVersion];
+  [fullCalendar release];
+  fullCalendar = nil;
+  [safeCalendar release];
+  safeCalendar = nil;
+  [originalCalendar release];
+  originalCalendar = nil;
+
+  return ex;
+}
+
 @end /* SOGoTaskObject */
diff --git a/SoObjects/Contacts/SOGoContactGCSEntry.m b/SoObjects/Contacts/SOGoContactGCSEntry.m
index a93285e20..2553b4346 100644
--- a/SoObjects/Contacts/SOGoContactGCSEntry.m
+++ b/SoObjects/Contacts/SOGoContactGCSEntry.m
@@ -136,4 +136,16 @@
   [self saveContentString: [vcard versitString]];
 }
 
+- (NSException *) saveContentString: (NSString *) newContent
+                        baseVersion: (unsigned int) newVersion
+{
+  NSException *ex;
+
+  ex = [super saveContentString: newContent baseVersion: newVersion];
+  [card release];
+  card = nil;
+
+  return ex;
+}
+
 @end /* SOGoContactGCSEntry */