diff --git a/source/java/org/alfresco/repo/dictionary/DictionaryDAOImpl.java b/source/java/org/alfresco/repo/dictionary/DictionaryDAOImpl.java
index b3aa84921a..ea436b5e59 100644
--- a/source/java/org/alfresco/repo/dictionary/DictionaryDAOImpl.java
+++ b/source/java/org/alfresco/repo/dictionary/DictionaryDAOImpl.java
@@ -309,7 +309,7 @@ public class DictionaryDAOImpl implements DictionaryDAO
     	if (models == null)
     	{
     		models = new ArrayList<CompiledModel>();
-    		getUriToModels().put(uri, models);
+    		getUriToModels(tenantDomain).put(uri, models);
     	}
     	if (!models.contains(model))
     	{
@@ -384,7 +384,7 @@ public class DictionaryDAOImpl implements DictionaryDAO
             return models;
         }
 
-        List<CompiledModel> models = getUriToModels().get(uri);
+        List<CompiledModel> models = getUriToModels("").get(uri);
         if (models == null)
         {
             models = Collections.emptyList(); 
@@ -850,16 +850,6 @@ public class DictionaryDAOImpl implements DictionaryDAO
             writeLock.unlock();
         }        
     }
-    
-    /**
-     * Get uriToModels from the cache (in the context of the current user's tenant domain)
-     * 
-     * @param tenantDomain
-     */
-    private Map<String, List<CompiledModel>> getUriToModels()
-    {
-        return getUriToModels(tenantService.getCurrentUserDomain());
-    }
 
     /**
      * Get uriToModels from the cache (in the context of the given tenant domain)