diff --git a/source/java/org/alfresco/repo/cache/CacheTest.java b/source/java/org/alfresco/repo/cache/CacheTest.java
index cc09107fd7..64401a98e9 100644
--- a/source/java/org/alfresco/repo/cache/CacheTest.java
+++ b/source/java/org/alfresco/repo/cache/CacheTest.java
@@ -663,7 +663,11 @@ public class CacheTest extends TestCase
             }
             
             txn.commit();
-            
+
+            // Check post-commit values
+            assertEquals("Definitive change not written through.", DEFINITIVE_ONE, backingCache.get(DEFINITIVE_ONE));
+            assertEquals("Definitive change not written through.", DEFINITIVE_TWO, backingCache.get(DEFINITIVE_TWO));
+            assertEquals("Definitive change not written through.", null, backingCache.get(DEFINITIVE_THREE));
         }
         finally
         {
diff --git a/source/java/org/alfresco/repo/domain/node/NodeEntity.java b/source/java/org/alfresco/repo/domain/node/NodeEntity.java
index 1d8611bd3f..689a2d1df8 100644
--- a/source/java/org/alfresco/repo/domain/node/NodeEntity.java
+++ b/source/java/org/alfresco/repo/domain/node/NodeEntity.java
@@ -22,6 +22,7 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.repo.domain.qname.QNameDAO;
 import org.alfresco.repo.security.permissions.PermissionCheckValue;
 import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.Pair;
 
@@ -192,6 +193,13 @@ public class NodeEntity implements Node, PermissionCheckValue
     @Override
     public boolean getDeleted(QNameDAO qnameDAO)
     {
+        // First check if it belongs to the 'deleted' stores
+        if (store.getProtocol().equals(StoreRef.PROTOCOL_DELETED))
+        {
+            // The store has been deleted
+            return true;
+        }
+        // Now check the type
         Pair<Long, QName> deletedTypeQNamePair = qnameDAO.getQName(ContentModel.TYPE_DELETED);
         return  deletedTypeQNamePair != null &&
                 deletedTypeQNamePair.getFirst().equals(typeQNameId);
diff --git a/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java b/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java
index 9966fdeeaf..ba1240b994 100644
--- a/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java
+++ b/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java
@@ -799,6 +799,12 @@ public class RepositoryAuthenticationDao implements MutableAuthenticationDao, In
             this.nodeRef = nodeRef;
             this.userDetails = userDetails;
             this.credentialExpiryDate = credentialExpiryDate;
+        }
+
+        @Override
+        public String toString()
+        {
+            return "CacheEntry [nodeRef=" + nodeRef + ", userDetails=" + userDetails + "]";
         }        
     }
 }