diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManager.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManager.java
index a444499..d2436e1 100644
--- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManager.java
+++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManager.java
@@ -38,6 +38,9 @@ public abstract class MongoManager {
 		
 		log.info("Got Mongo Client at "+client.getConnectPoint());
 		log.debug("Mongo client is "+client);
+
+
+
 		// NOT AUTHORIZED
 //		log.debug("Existing databases "+client.getDatabaseNames());		
 	}
diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/MongoClientProvider.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/MongoClientProvider.java
index b2ea787..6626389 100644
--- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/MongoClientProvider.java
+++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/MongoClientProvider.java
@@ -31,14 +31,13 @@ public class MongoClientProvider extends AbstractScopedMap<MongoClient>{
 		MongoCredential credential = MongoCredential.createCredential(conn.getUser(), conn.getDatabase(), 
 				conn.getPassword().toCharArray());
 
-		
-		
 		 MongoClientOptions options = MongoClientOptions.builder().
 				 threadsAllowedToBlockForConnectionMultiplier(10).
 				 connectionsPerHost(20).
 				 maxConnectionIdleTime(10000).
 				 applicationName("geoportal-service").
 				 sslEnabled(true).
+				 connectTimeout(30000).
 				 build();
 
 		 return new MongoClient(new ServerAddress(conn.getHosts().get(0),conn.getPort()),
diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/StorageClientProvider.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/StorageClientProvider.java
index 48e6fdb..eaaf08a 100644
--- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/StorageClientProvider.java
+++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/StorageClientProvider.java
@@ -25,7 +25,7 @@ public class StorageClientProvider extends AbstractScopedMap<StorageUtils> {
 	
 	public StorageClientProvider() {
 		super("Storage client cache");
-		setTTL(Duration.of(10, ChronoUnit.MINUTES));
+//		setTTL(Duration.of(10, ChronoUnit.MINUTES));
 	}
 	
 	@Override
@@ -37,7 +37,7 @@ public class StorageClientProvider extends AbstractScopedMap<StorageUtils> {
 	@Override
 	protected void dispose(StorageUtils toDispose) {
 		try {
-			//TODO
+			toDispose.forceClose();
 		}catch (NullPointerException e) {
 			// expected if closed without uploading
 		}catch(Throwable t) {
diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/caches/Caches.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/caches/Caches.java
index 6f2b2f6..296e7f6 100644
--- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/caches/Caches.java
+++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/caches/Caches.java
@@ -96,4 +96,7 @@ public class Caches extends BasicServiceTestUnit {
             if(executed.get()==launched.get()) service.shutdown();
         }
     }
+
+
+
 }