diff --git a/components/action-mgt/org.wso2.carbon.identity.action.management/pom.xml b/components/action-mgt/org.wso2.carbon.identity.action.management/pom.xml
index 832acc06912b..d348e9d2ecde 100644
--- a/components/action-mgt/org.wso2.carbon.identity.action.management/pom.xml
+++ b/components/action-mgt/org.wso2.carbon.identity.action.management/pom.xml
@@ -89,7 +89,6 @@
                         </Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Private-Package>
-                            org.wso2.carbon.identity.action.management.cache,
                             org.wso2.carbon.identity.action.management.constant,
                             org.wso2.carbon.identity.action.management.dao.*,
                             org.wso2.carbon.identity.action.management.internal,
@@ -97,6 +96,7 @@
                             org.wso2.carbon.identity.action.management.util
                         </Private-Package>
                         <Export-Package>
+                            org.wso2.carbon.identity.action.management.cache,
                             org.wso2.carbon.identity.action.management.constant.error,
                             org.wso2.carbon.identity.action.management.exception,
                             org.wso2.carbon.identity.action.management.model,
diff --git a/components/action-mgt/org.wso2.carbon.identity.action.management/src/main/java/org/wso2/carbon/identity/action/management/cache/ActionCacheEntry.java b/components/action-mgt/org.wso2.carbon.identity.action.management/src/main/java/org/wso2/carbon/identity/action/management/cache/ActionCacheEntry.java
index 4ed821e43765..cec36a14b47a 100644
--- a/components/action-mgt/org.wso2.carbon.identity.action.management/src/main/java/org/wso2/carbon/identity/action/management/cache/ActionCacheEntry.java
+++ b/components/action-mgt/org.wso2.carbon.identity.action.management/src/main/java/org/wso2/carbon/identity/action/management/cache/ActionCacheEntry.java
@@ -28,6 +28,7 @@
  */
 public class ActionCacheEntry extends CacheEntry {
 
+    private static final long serialVersionUID = 2789265346825849739L;
     private List<Action> actionsOfActionType;
 
     public ActionCacheEntry(List<Action> actionsOfActionType) {
diff --git a/components/action-mgt/org.wso2.carbon.identity.action.management/src/main/java/org/wso2/carbon/identity/action/management/cache/ActionTypeCacheKey.java b/components/action-mgt/org.wso2.carbon.identity.action.management/src/main/java/org/wso2/carbon/identity/action/management/cache/ActionTypeCacheKey.java
index 98fd51cf3dfc..76609a0e866d 100644
--- a/components/action-mgt/org.wso2.carbon.identity.action.management/src/main/java/org/wso2/carbon/identity/action/management/cache/ActionTypeCacheKey.java
+++ b/components/action-mgt/org.wso2.carbon.identity.action.management/src/main/java/org/wso2/carbon/identity/action/management/cache/ActionTypeCacheKey.java
@@ -25,6 +25,7 @@
  */
 public class ActionTypeCacheKey extends CacheKey {
 
+    private static final long serialVersionUID = 8132735629148475983L;
     private final String actionType;
 
     public ActionTypeCacheKey(String actionType) {
diff --git a/components/certificate-mgt/org.wso2.carbon.identity.certificate.management/pom.xml b/components/certificate-mgt/org.wso2.carbon.identity.certificate.management/pom.xml
index 19d0c2f0a797..3a6cb2783f17 100644
--- a/components/certificate-mgt/org.wso2.carbon.identity.certificate.management/pom.xml
+++ b/components/certificate-mgt/org.wso2.carbon.identity.certificate.management/pom.xml
@@ -75,7 +75,6 @@
                         </Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Private-Package>
-                            org.wso2.carbon.identity.certificate.management.cache,
                             org.wso2.carbon.identity.certificate.management.constant,
                             org.wso2.carbon.identity.certificate.management.dao.*,
                             org.wso2.carbon.identity.certificate.management.internal,
@@ -83,6 +82,7 @@
                             org.wso2.carbon.identity.certificate.management.util;
                         </Private-Package>
                         <Export-Package>
+                            org.wso2.carbon.identity.certificate.management.cache,
                             org.wso2.carbon.identity.certificate.management.exception,
                             org.wso2.carbon.identity.certificate.management.model,
                             org.wso2.carbon.identity.certificate.management.service;
diff --git a/components/certificate-mgt/org.wso2.carbon.identity.certificate.management/src/main/java/org/wso2/carbon/identity/certificate/management/cache/CertificateIdCacheKey.java b/components/certificate-mgt/org.wso2.carbon.identity.certificate.management/src/main/java/org/wso2/carbon/identity/certificate/management/cache/CertificateIdCacheKey.java
index 635f4aac07b6..fa555ed729cb 100644
--- a/components/certificate-mgt/org.wso2.carbon.identity.certificate.management/src/main/java/org/wso2/carbon/identity/certificate/management/cache/CertificateIdCacheKey.java
+++ b/components/certificate-mgt/org.wso2.carbon.identity.certificate.management/src/main/java/org/wso2/carbon/identity/certificate/management/cache/CertificateIdCacheKey.java
@@ -25,6 +25,7 @@
  */
 public class CertificateIdCacheKey extends CacheKey {
 
+    private static final long serialVersionUID = 5691238745928475691L;
     private final String certificateId;
 
     public CertificateIdCacheKey(String certificateId) {