diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
index 0315ded1004..c26eea0de4f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
@@ -184,7 +184,7 @@ public class OperationManagerImpl implements OperationManager {
             } finally {
                 DeviceManagementDAOFactory.closeConnection();
             }
-            
+
             OperationManagementDAOFactory.openConnection();
             if (enrolmentId < 0) {
                 throw new OperationManagementException("Device not found for the given device Identifier:" +
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
index a2333b475df..7e7a50ecd80 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
@@ -71,7 +71,8 @@
                             org.wso2.carbon.user.api.*,
                             org.wso2.carbon.device.mgt.core.*,
                             org.wso2.carbon.device.mgt.common.*,
-                            org.wso2.carbon.ntask.*
+                            org.wso2.carbon.ntask.*,
+                            org.wso2.carbon.caching.*
                         </Import-Package>
                         <Export-Package>
                             !org.wso2.carbon.policy.mgt.core.internal,
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/cache/impl/PolicyCacheManagerImpl.java b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/cache/impl/PolicyCacheManagerImpl.java
index 677b30920d2..624b5ac9d4b 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/cache/impl/PolicyCacheManagerImpl.java
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/cache/impl/PolicyCacheManagerImpl.java
@@ -21,26 +21,28 @@ package org.wso2.carbon.policy.mgt.core.cache.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.policy.mgt.common.Policy;
 import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
 import org.wso2.carbon.policy.mgt.core.cache.PolicyCacheManager;
 import org.wso2.carbon.policy.mgt.core.mgt.PolicyManager;
 import org.wso2.carbon.policy.mgt.core.mgt.impl.PolicyManagerImpl;
+import org.wso2.carbon.policy.mgt.core.util.PolicyManagementConstants;
+import org.wso2.carbon.policy.mgt.core.util.PolicyManagerUtil;
 
-import java.util.ArrayList;
-import java.util.HashMap;
+import javax.cache.Cache;
+import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 
 public class PolicyCacheManagerImpl implements PolicyCacheManager {
 
     private static final Log log = LogFactory.getLog(PolicyCacheManagerImpl.class);
 
-    private static HashMap<Integer, HashMap<Integer, Policy>> tenantedPolicyMap = new HashMap<>();
-
     private static PolicyCacheManagerImpl policyCacheManager;
 
+    private static Cache<Integer, List<Policy>> getPolicyListCache() {
+        return PolicyManagerUtil.getPolicyListCache(PolicyManagementConstants.DM_CACHE_LIST);
+    }
+
     private PolicyCacheManagerImpl() {
     }
 
@@ -57,43 +59,36 @@ public class PolicyCacheManagerImpl implements PolicyCacheManager {
 
     @Override
     public void addAllPolicies(List<Policy> policies) {
-        HashMap<Integer, Policy> map = this.getTenantRelatedMap();
-        if (map.isEmpty()) {
-            for (Policy policy : policies) {
-                map.put(policy.getId(), policy);
-            }
-        }
 
+        Cache<Integer, List<Policy>> lCache = getPolicyListCache();
+        lCache.put(1, policies);
     }
 
     @Override
     public void updateAllPolicies(List<Policy> policies) {
-        HashMap<Integer, Policy> map = this.getTenantRelatedMap();
-        map.clear();
-        if (map.isEmpty()) {
-            for (Policy policy : policies) {
-                map.put(policy.getId(), policy);
-            }
-        }
+
+        Cache<Integer, List<Policy>> lCache = getPolicyListCache();
+        lCache.removeAll();
+        lCache.put(1, policies);
     }
 
     @Override
     public List<Policy> getAllPolicies() throws PolicyManagementException {
-        HashMap<Integer, Policy> map = this.getTenantRelatedMap();
-        if (map.isEmpty()) {
+
+        Cache<Integer, List<Policy>> lCache = getPolicyListCache();
+        if (!lCache.containsKey(1)) {
             PolicyManager policyManager = new PolicyManagerImpl();
             this.addAllPolicies(policyManager.getPolicies());
         }
         if (log.isDebugEnabled()) {
-            log.debug("No of policies stored in the cache .. : " + map.size());
-
-            Set<Integer> keySet = map.keySet();
-            for (Integer x : keySet) {
-                log.debug("Policy id in maps .. : " + map.get(x).getId() + " policy name : " + map.get(x).
-                        getPolicyName() + " Activated : " + map.get(x).isActive());
+            List<Policy> cachedPolicy = lCache.get(1);
+            for (Policy policy : cachedPolicy) {
+                log.debug("Policy id in cache .. : " + policy.getId() + " policy name : " + policy.
+                        getPolicyName() + " Activated : " + policy.isActive());
             }
         }
-        return new ArrayList<>(map.values());
+        return lCache.get(1);
+
     }
 
     @Override
@@ -105,59 +100,97 @@ public class PolicyCacheManagerImpl implements PolicyCacheManager {
 
     @Override
     public void removeAllPolicies() {
-        HashMap<Integer, Policy> map = this.getTenantRelatedMap();
-        map.clear();
+
+        Cache<Integer, List<Policy>> lCache = getPolicyListCache();
+        lCache.removeAll();
     }
 
     @Override
     public void addPolicy(Policy policy) {
-        HashMap<Integer, Policy> map = this.getTenantRelatedMap();
-        if (!map.containsKey(policy.getId())) {
-            map.put(policy.getId(), policy);
-        } else {
-            log.warn("Policy id (" + policy.getId() + ") already exist in the map. hence not attempted to store.");
+
+        Cache<Integer, List<Policy>> lCache = getPolicyListCache();
+        if (lCache.containsKey(1)) {
+            List<Policy> cachedPolicy = lCache.get(1);
+
+            for (Policy pol : cachedPolicy) {
+                if (pol.getId() == policy.getId()) {
+                    return;
+                }
+            }
+            cachedPolicy.add(policy);
         }
+
     }
 
     @Override
     public void updatePolicy(Policy policy) {
-        HashMap<Integer, Policy> map = this.getTenantRelatedMap();
-        if (map.containsKey(policy.getId())) {
-            map.remove(policy.getId());
-            map.put(policy.getId(), policy);
+
+        Cache<Integer, List<Policy>> lCache = getPolicyListCache();
+        if (lCache.containsKey(1)) {
+            List<Policy> cachedPolicy = lCache.get(1);
+            Iterator iterator = cachedPolicy.iterator();
+            while (iterator.hasNext()) {
+                Policy pol = (Policy) iterator.next();
+                if (pol.getId() == policy.getId()) {
+                    iterator.remove();
+                    break;
+                }
+            }
+            cachedPolicy.add(policy);
+            lCache.replace(1, cachedPolicy);
         }
+
     }
 
     @Override
     public void updatePolicy(int policyId) throws PolicyManagementException {
-        HashMap<Integer, Policy> map = this.getTenantRelatedMap();
-        if (map.containsKey(policyId)) {
-            this.removePolicy(policyId);
+
+        Cache<Integer, List<Policy>> lCache = getPolicyListCache();
+        if (lCache.containsKey(1)) {
+            PolicyManager policyManager = new PolicyManagerImpl();
+            Policy policy = policyManager.getPolicy(policyId);
+            this.updatePolicy(policy);
         }
-        PolicyManager policyManager = new PolicyManagerImpl();
-        Policy policy = policyManager.getPolicy(policyId);
-        map.put(policyId, policy);
+
     }
 
     @Override
     public void removePolicy(int policyId) {
-        HashMap<Integer, Policy> map = this.getTenantRelatedMap();
-        if (map.containsKey(policyId)) {
-            map.remove(policyId);
-        } else {
-            log.warn("Policy id (" + policyId + ") does not exist in the cache. Hence not removed.");
+
+        Cache<Integer, List<Policy>> lCache = getPolicyListCache();
+        if (lCache.containsKey(1)) {
+            List<Policy> cachedPolicy = lCache.get(1);
+            Iterator iterator = cachedPolicy.iterator();
+            while (iterator.hasNext()) {
+                Policy pol = (Policy) iterator.next();
+                if (pol.getId() == policyId) {
+                    iterator.remove();
+                    break;
+                }
+            }
+            lCache.replace(1, cachedPolicy);
         }
     }
 
     @Override
     public Policy getPolicy(int policyId) throws PolicyManagementException {
-        HashMap<Integer, Policy> map = this.getTenantRelatedMap();
-        if (!map.containsKey(policyId)) {
+
+        Cache<Integer, List<Policy>> lCache = getPolicyListCache();
+        if (!lCache.containsKey(1)) {
             this.removeAllPolicies();
             this.getAllPolicies();
         }
-        return map.get(policyId);
 
+        Policy policy = null;
+        List<Policy> cachedPolicy = lCache.get(1);
+        Iterator iterator = cachedPolicy.iterator();
+        while (iterator.hasNext()) {
+            Policy pol = (Policy) iterator.next();
+            if (pol.getId() == policyId) {
+                policy = pol;
+            }
+        }
+        return policy;
     }
 
     @Override
@@ -175,13 +208,4 @@ public class PolicyCacheManagerImpl implements PolicyCacheManager {
         return 0;
     }
 
-    private HashMap<Integer, Policy> getTenantRelatedMap(){
-
-        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-        if(!tenantedPolicyMap.containsKey(tenantId)){
-            HashMap<Integer, Policy> policyMap = new HashMap<>();
-            tenantedPolicyMap.put(tenantId, policyMap);
-        }
-        return tenantedPolicyMap.get(tenantId);
-    }
 }
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/util/PolicyManagementConstants.java b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/util/PolicyManagementConstants.java
index e8354b3e992..13a2df34427 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/util/PolicyManagementConstants.java
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/util/PolicyManagementConstants.java
@@ -39,6 +39,7 @@ public final class PolicyManagementConstants {
 
     public static final String DM_CACHE_MANAGER = "DM_CACHE_MANAGER";
     public static final String DM_CACHE = "DM_CACHE";
+    public static final String DM_CACHE_LIST = "DM_CACHE_LIST";
 
 
     public static final String DELEGATION_TASK_TYPE = "DELEGATION__TASK";
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/util/PolicyManagerUtil.java b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/util/PolicyManagerUtil.java
index 198913c0557..982b3859a79 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/util/PolicyManagerUtil.java
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/util/PolicyManagerUtil.java
@@ -152,10 +152,28 @@ public class PolicyManagerUtil {
     }
 
 
-    public static Cache getCacheManagerImpl() {
-        return Caching.getCacheManagerFactory()
-                .getCacheManager(PolicyManagementConstants.DM_CACHE_MANAGER).getCache(PolicyManagementConstants
-                        .DM_CACHE);
+//    public static Cache getCacheManagerImpl() {
+//        return Caching.getCacheManagerFactory()
+//                .getCacheManager(PolicyManagementConstants.DM_CACHE_MANAGER).getCache(PolicyManagementConstants
+//                        .DM_CACHE);
+//    }
+
+
+    public static Cache<Integer, Policy> getPolicyCache(String name){
+        CacheManager manager = getCacheManager();
+        return (manager != null) ? manager.<Integer, Policy>getCache(name) :
+                Caching.getCacheManager().<Integer, Policy>getCache(name);
+    }
+
+    public static Cache<Integer, List<Policy>> getPolicyListCache(String name){
+        CacheManager manager = getCacheManager();
+        return (manager != null) ? manager.<Integer, List<Policy>>getCache(name) :
+                Caching.getCacheManager().<Integer, List<Policy>>getCache(name);
+    }
+
+    private static CacheManager getCacheManager() {
+        return Caching.getCacheManagerFactory().getCacheManager(
+                PolicyManagementConstants.DM_CACHE_MANAGER);
     }