diff --git a/.classpath b/.classpath
index 248406b..cba59aa 100644
--- a/.classpath
+++ b/.classpath
@@ -10,5 +10,18 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/pom.xml b/pom.xml
index afc2d5c..915e315 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-bom</artifactId>
-				<version>3.0.0</version>
+				<version>3.0.1-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/src/main/java/org/gcube/common/clients/cache/Key.java b/src/main/java/org/gcube/common/clients/cache/Key.java
index 6d90326..4179d2b 100644
--- a/src/main/java/org/gcube/common/clients/cache/Key.java
+++ b/src/main/java/org/gcube/common/clients/cache/Key.java
@@ -32,7 +32,7 @@ public final class Key {
 	private Key(String name, Query<?> query) {
 		this.name = name;
 		this.query = query;
-		this.scope = SecretManagerProvider.instance.get().getContext();
+		this.scope = SecretManagerProvider.get().getContext();
 	}
 
 	@Override
diff --git a/src/main/java/org/gcube/common/clients/delegates/AsyncProxyDelegate.java b/src/main/java/org/gcube/common/clients/delegates/AsyncProxyDelegate.java
index 20625b2..a8ff146 100644
--- a/src/main/java/org/gcube/common/clients/delegates/AsyncProxyDelegate.java
+++ b/src/main/java/org/gcube/common/clients/delegates/AsyncProxyDelegate.java
@@ -97,7 +97,7 @@ public class AsyncProxyDelegate<S> implements ProxyDelegate<S> {
 	 */
 	public <V> Future<V> makeAsync(final Call<S, V> call, ExecutorService service) throws RejectedExecutionException {
 
-		final Secret secret = SecretManagerProvider.instance.get();
+		final Secret secret = SecretManagerProvider.get();
 		
 		// create task from call
 		Callable<V> callTask = new Callable<V>() {
@@ -105,7 +105,7 @@ public class AsyncProxyDelegate<S> implements ProxyDelegate<S> {
 			@Override
 			public V call() throws Exception {
 				
-				SecretManagerProvider.instance.set(secret);
+				SecretManagerProvider.set(secret);
 				
 				return inner.make(call);
 			}
diff --git a/src/test/java/org/gcube/common/clients/AsyncDelegateTest.java b/src/test/java/org/gcube/common/clients/AsyncDelegateTest.java
index 458b0b0..e656d3d 100644
--- a/src/test/java/org/gcube/common/clients/AsyncDelegateTest.java
+++ b/src/test/java/org/gcube/common/clients/AsyncDelegateTest.java
@@ -106,7 +106,7 @@ public class AsyncDelegateTest {
 	public void asyncCallsExecuteInCallScope() throws Exception {
 
 		final String scope = "a/b/c";
-		SecretManagerProvider.instance.set(new Secret() {
+		SecretManagerProvider.set(new Secret() {
 
 
 			@Override
@@ -137,7 +137,7 @@ public class AsyncDelegateTest {
 		Answer<?> checkingScope= new Answer<Object>() {
 			@Override
 			public Object answer(InvocationOnMock invocation) throws Throwable {
-				assertEquals(scope,SecretManagerProvider.instance.get().getContext());
+				assertEquals(scope,SecretManagerProvider.get().getContext());
 				return value;
 			}
 		};
@@ -171,7 +171,7 @@ public class AsyncDelegateTest {
 	public void asyncCallsAreInterrupted() throws Exception {
 
 		final String scope = "a/b/c";
-		SecretManagerProvider.instance.set(new Secret() {
+		SecretManagerProvider.set(new Secret() {
 
 
 			@Override