diff --git a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
index 4f892be4cc..a8139f8fc6 100644
--- a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
+++ b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Import-Package: javax.crypto,
  org.osgi.framework;version="1.3.0",
  org.slf4j;version="1.6.1",
  org.w3c.dom
-DynamicImport-Package: *
+DynamicImport-Package: org.*, com.*, javax.*
 Bundle-ClassPath: .,
  lib/hazelcast-aws.jar,
  lib/hazelcast.jar
diff --git a/org.idempiere.hazelcast.service/OSGI-INF/cacheservice.xml b/org.idempiere.hazelcast.service/OSGI-INF/cacheservice.xml
index 6d5ab88e98..4e414e0f8f 100644
--- a/org.idempiere.hazelcast.service/OSGI-INF/cacheservice.xml
+++ b/org.idempiere.hazelcast.service/OSGI-INF/cacheservice.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.hazelcast.service.CacheServiceImpl">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.idempiere.hazelcast.service.CacheServiceImpl">
    <implementation class="org.idempiere.hazelcast.service.CacheServiceImpl"/>
    <service>
       <provide interface="org.idempiere.distributed.ICacheService"/>