diff --git a/ChangeLog b/ChangeLog
index f3a48e777..04a292b8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-11  Ludovic Marcotte  <lmarcotte@inverse.ca>
+	
+	* Fixed a couple of issues in the new pref caching
+	  subsystem.
+
 2008-10-29  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* SoObjects/SOGo/SOGoUser.m ([-userDefaults]): added support for
diff --git a/SoObjects/SOGo/SOGoCache.m b/SoObjects/SOGo/SOGoCache.m
index 33f076967..a091130cd 100644
--- a/SoObjects/SOGo/SOGoCache.m
+++ b/SoObjects/SOGo/SOGoCache.m
@@ -208,10 +208,12 @@ static SOGoCache *sharedCache = nil;
   d = [[NSMutableDictionary alloc] init];
   [d addEntriesFromDictionary: [theNotification userInfo]];
   
-  user = [d objectForKey: @"uid"];  
+  user = [d objectForKey: @"uid"];
+  [user retain];
   [d removeObjectForKey: @"uid"];
 
   [SOGoUser setUserDefaultsFromDictionary: d  user: user];
+  [user release];
   [d release];
 }
 
@@ -223,10 +225,12 @@ static SOGoCache *sharedCache = nil;
   d = [[NSMutableDictionary alloc] init];
   [d addEntriesFromDictionary: [theNotification userInfo]];
   
-  user = [d objectForKey: @"uid"];  
+  user = [d objectForKey: @"uid"];
+  [user retain];
   [d removeObjectForKey: @"uid"];
 
   [SOGoUser setUserSettingsFromDictionary: d  user: user];
+  [user release];
   [d release];
 }
 
@@ -267,7 +271,7 @@ static SOGoCache *sharedCache = nil;
       
       if ([now earlierDate: [currentEntry objectForKey: @"cleanupDate"]] == now)
 	{
-	  [SOGoUser setUserDefaultsFromDictionary: nil  user: currentID];
+	  [SOGoUser setUserSettingsFromDictionary: nil  user: currentID];
 	  count++;
 	}
     }
diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index 2b6784b63..1e0f0376a 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -541,7 +541,7 @@ _timeValue (NSString *key)
 
 + (NSDictionary *) userSettingsCache
 {
-  return userDefaults;
+  return userSettings;
 }
 
 - (NSUserDefaults *) userSettings