diff --git a/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java b/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java
index 4262ac9..654bacd 100644
--- a/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java
+++ b/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java
@@ -12,6 +12,8 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.gcube.common.authorization.client.Binder;
 import org.gcube.common.authorization.client.exceptions.ObjectNotFound;
@@ -30,7 +32,7 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
 
 	private static Logger log = LoggerFactory.getLogger(AuthorizationProxy.class);
 	
-	//private static Map<String, AuthorizationEntryCache> cache = new HashMap<String, AuthorizationEntryCache>();
+	private static Map<String, AuthorizationEntryCache> cache = new ConcurrentHashMap<String, AuthorizationEntryCache>();
 	
 	private List<AuthorizationEndpoint> endpoints;
 
@@ -86,8 +88,8 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
 		
 	@Override
 	public AuthorizationEntry get(String token) throws ObjectNotFound, Exception{
-		/*if (cache.containsKey(token) && cache.get(token).isValid())
-			return cache.get(token).getEntry();*/
+		if (cache.containsKey(token) && cache.get(token).isValid())
+			return cache.get(token).getEntry();
 		
 		final String methodPath = "/retrieve/"; 
 
diff --git a/src/test/java/org/gcube/common/authorizationservice/cl/CallTest.java b/src/test/java/org/gcube/common/authorizationservice/cl/CallTest.java
index 7ac21f9..778f3b4 100644
--- a/src/test/java/org/gcube/common/authorizationservice/cl/CallTest.java
+++ b/src/test/java/org/gcube/common/authorizationservice/cl/CallTest.java
@@ -6,6 +6,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.gcube.common.authorization.client.exceptions.ObjectNotFound;
+import org.gcube.common.authorization.library.AuthorizationEntry;
 import org.gcube.common.authorization.library.policies.Action;
 import org.gcube.common.authorization.library.policies.Policy;
 import org.gcube.common.authorization.library.policies.ServiceAccess;
@@ -19,7 +20,9 @@ public class CallTest {
 	@Test
 	public void call()  throws Exception{
 				try{
-			System.out.println(authorizationService().get("3b34750e-d39b-4d3c-924d-efcf7cc907c1"));
+			AuthorizationEntry entry = authorizationService().get("3b34750e-d39b-4d3c-924d-efcf7cc907c1");
+			
+			System.out.println(entry);
 		}catch(ObjectNotFound onf){
 			onf.printStackTrace();
 		}