1 files changed, 28 insertions, 5 deletions

diff --git a/src/tests/cache.cpp b/src/tests/cache.cpp
index 00a32dd..5731a6a 100644
--- a/src/tests/cache.cpp
+++ b/src/tests/cache.cpp
@@ -5,6 +5,7 @@
 #include <bu/myriadstream.h>
 #include <bu/file.h>
 #include <bu/streamstack.h>
+#include <bu/readwritemutex.h>
 
 //
 // New Cache Implementation
@@ -29,8 +30,8 @@ public:
 
     typedef CacheBase<keytype, obtype> CacheType;
 
-    virtual const keytype getKey() const=0;
-    virtual const int getPersistenceScore() const { return 0; }
+    virtual keytype getKey() const=0;
+    virtual int getPersistenceScore() const { return 0; }
 
     void changed( bool bChanged=true )
     {
@@ -55,14 +56,31 @@ template<typename keytype, typename obtype, typename basetype=obtype>
 class CachePtr
 {
 friend class CacheBase<keytype, basetype>;
-public:
-    CachePtr()
+private:
+    CachePtr( CacheBase<keytype, basetype> *pCache, obtype *pData, const keytype &kId ) :
+        pCache( pCache ),
+        kId( kId ),
+        pData( pData )
     {
     }
 
+    CachePtr( CacheBase<keytype, basetype> *pCache, const keytype &kId ) :
+        pCache( pCache ),
+        kId( kId ),
+        pData( NULL )
+    {
+    }
+
+public:
     virtual ~CachePtr()
     {
     }
+
+private:
+    CacheBase<keytype, basetype> *pCache;
+    mutable keytype kId;
+    mutable obtype *pData;
+
 };
 
 template<typename keytype, typename obtype>
@@ -78,6 +96,11 @@ public:
     }
 
 protected:
+    void objectChanged( const keytype &k )
+    {
+    }
+
+protected:
     virtual void _create( obtype *o )=0;
     virtual void _erase( const keytype &k )=0;
 
@@ -175,7 +198,7 @@ public:
     {
     }
 
-    virtual const Bu::Uuid getKey() const
+    virtual Bu::Uuid getKey() const
     {
         return uId;
     }