2 files changed, 13 insertions, 2 deletions

diff --git a/default.bld b/default.bld
index 2077185..8f21f6c 100644
--- a/default.bld
+++ b/default.bld
@@ -16,8 +16,8 @@ include "gensigs.bld";
 CXXFLAGS += "-ggdb -W -Wall -I.";
 
 // Deep memory checks
-CXXFLAGS += "-fsanitize=address -fno-omit-frame-pointer";
-LDFLAGS += "-fsanitize=address -fno-omit-frame-pointer";
+// CXXFLAGS += "-fsanitize=address -fno-omit-frame-pointer";
+// LDFLAGS += "-fsanitize=address -fno-omit-frame-pointer";
 
 //CXXFLAGS += "-pg";
 //LDFLAGS += "-pg";
diff --git a/src/unstable/cachebase.h b/src/unstable/cachebase.h
index 7a54465..762aca2 100644
--- a/src/unstable/cachebase.h
+++ b/src/unstable/cachebase.h
@@ -34,6 +34,13 @@ namespace Bu
         {
         }
 
+        virtual ~CacheEntry()
+        {
+            mEntry.lock();
+            delete pObject;
+            mEntry.unlock();
+        }
+
     public:
         int getRefCount() const
         {
@@ -386,6 +393,10 @@ namespace Bu
 
         virtual ~CacheBase()
         {
+            for( typename CacheEntryHash::iterator i = hCacheEntry.begin(); i; i++ )
+            {
+                delete i.getValue();
+            }
         }
 
         typedef CacheEntry<keytype, obtype> Entry;