1 files changed, 21 insertions, 7 deletions

diff --git a/src/unstable/cachebase.h b/src/unstable/cachebase.h
index af2884c..bb543dd 100644
--- a/src/unstable/cachebase.h
+++ b/src/unstable/cachebase.h
@@ -328,6 +328,7 @@ namespace Bu
 
         typedef CacheEntry<keytype, obtype> Entry;
         typedef Bu::List<keytype> KeyList;
+        typedef CacheObject<keytype, obtype> ObjectType;
 
         CachePtr<keytype, obtype> insert( obtype *pObject )
         {
@@ -466,7 +467,10 @@ namespace Bu
         virtual void _create( const obtype *o )=0;
         virtual void _erase( const keytype &k )=0;
 
-        virtual obtype *_load( const keytype &k )=0;
+        virtual obtype *_load(
+            typename Bu::CacheObject<keytype, obtype>::Initializer &initObj,
+            const keytype &k
+            )=0;
         virtual void _save( const obtype *o )=0;
 
         virtual void _sync()=0;
@@ -481,7 +485,10 @@ namespace Bu
                 hChanged.insert( pObject->getKey(), true );
             mCacheEntry.unlockWrite();
             _create( pObject );
-            pObject->setCache( this, pEnt );
+            // I'm not sold on the ordering here...or the fact we're not
+            // using th initilizer
+            pObject->setCache( this );
+            pObject->setCacheEntry( pEnt );
             
             return pEnt;
         }
@@ -497,9 +504,12 @@ namespace Bu
             catch(...)
             {
                 // try to load the object from the backing store
-                obtype *pObject = _load( k );
+                typename ObjectType::Initializer initObj(
+                    this
+                    );
+                obtype *pObject = _load( initObj, k );
                 pEnt = new Entry( pObject );
-                pObject->setCache( this, pEnt );
+                pObject->setCacheEntry( pEnt );
                 Bu::ReadWriteMutex::WriteLocker wl( mCacheEntry );
                 hCacheEntry.insert( k, pEnt );
             }
@@ -536,11 +546,15 @@ namespace Bu
         ar << *pObject;
     }
 
-    template<typename obtype>
-    obtype *_cacheObjectLoad( Bu::Stream &s )
+    template<typename keytype, typename obtype>
+    obtype *_cacheObjectLoad(
+        typename Bu::CacheObject<keytype, obtype>::Initializer &initObject,
+        const keytype & /*rKey*/,
+        Bu::Stream &s
+        )
     {
         Bu::Archive ar( s, Bu::Archive::load );
-        obtype *ret = new obtype();
+        obtype *ret = initObject(new obtype());
         ar >> *ret;
         return ret;
     }