diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/contexts/ContextCache.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/contexts/ContextCache.java
index 495fd19..dec0a70 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/contexts/ContextCache.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/contexts/ContextCache.java
@@ -187,12 +187,12 @@ public class ContextCache {
 	
 	public synchronized Context getContextByUUID(String uuid) throws ResourceRegistryException {
 		refreshContextsIfNeeded();
-		return uuidToContext.get(UUID.fromString(uuid));
+		return getContextByUUID(UUID.fromString(uuid));
 	}
 	
 	public synchronized Context getContextByFullName(String contextFullName) throws ResourceRegistryException {
 		UUID uuid = getUUIDByFullName(contextFullName);
-		return uuidToContext.get(uuid);
+		return getContextByUUID(uuid);
 	}
 	
 	/**