diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/src/main/resources/META-INF/spring-context.xml b/redback-keys/redback-keys-providers/redback-keys-cached/src/main/resources/META-INF/spring-context.xml
index cb8c29f6..69336596 100644
--- a/redback-keys/redback-keys-providers/redback-keys-cached/src/main/resources/META-INF/spring-context.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/src/main/resources/META-INF/spring-context.xml
@@ -31,7 +31,7 @@
   <context:component-scan 
     base-package="org.apache.archiva.redback.keys.cached"/>
 
-  <bean name="cache#keys" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#keys" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>
diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
index d0b8b024..0011db39 100644
--- a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
@@ -49,7 +49,7 @@
 
   <alias name="commons-configuration" alias="test-conf"/>
 
-  <bean name="cache#keys" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#keys" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>
diff --git a/redback-rbac/redback-authorization-rbac/src/test/resources/spring-context.xml b/redback-rbac/redback-authorization-rbac/src/test/resources/spring-context.xml
index 9aacd8ad..e12bd391 100644
--- a/redback-rbac/redback-authorization-rbac/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-authorization-rbac/src/test/resources/spring-context.xml
@@ -34,7 +34,7 @@
   
   <alias name="userManager#memory" alias="userManager#jdo"/>
 
-  <bean name="cache#users" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#users" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/resources/META-INF/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/resources/META-INF/spring-context.xml
index 9e667728..f24140f3 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/resources/META-INF/spring-context.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/resources/META-INF/spring-context.xml
@@ -31,7 +31,7 @@
   <context:component-scan 
     base-package="org.apache.archiva.redback.rbac.cached"/>
 
-  <bean name="cache#operations" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#operations" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>
@@ -42,7 +42,7 @@
     <property name="timeToLiveSeconds" value="14400"/>
   </bean>
 
-  <bean name="cache#permissions" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#permissions" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>
@@ -53,7 +53,7 @@
     <property name="timeToLiveSeconds" value="14400"/>
   </bean>
 
-  <bean name="cache#resources" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#resources" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>
@@ -64,7 +64,7 @@
     <property name="timeToLiveSeconds" value="14400"/>
   </bean>
 
-  <bean name="cache#roles" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#roles" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>
@@ -75,7 +75,7 @@
     <property name="timeToLiveSeconds" value="14400"/>
   </bean>
 
-  <bean name="cache#effectiveRoleSet" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#effectiveRoleSet" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>
@@ -90,7 +90,7 @@
          Caches with Short Term entries
        ================================================================ -->
 
-  <bean name="cache#userAssignments" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#userAssignments" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>
@@ -101,7 +101,7 @@
     <property name="timeToLiveSeconds" value="600"/>
   </bean>
 
-  <bean name="cache#userPermissions" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#userPermissions" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
index cd7d00cb..d732d499 100755
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
@@ -58,7 +58,7 @@
     <property name="userPermissionsCache" ref="cache#userPermissions"/>
   </bean>
 
-  <bean name="cache#userAssignments" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#userAssignments" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>
@@ -69,7 +69,7 @@
     <property name="timeToLiveSeconds" value="600"/>
   </bean>
 
-  <bean name="cache#userPermissions" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#userPermissions" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>
diff --git a/redback-users/redback-users-providers/redback-users-cached/src/main/resources/META-INF/spring-context.xml b/redback-users/redback-users-providers/redback-users-cached/src/main/resources/META-INF/spring-context.xml
index 42c80d12..36320c04 100644
--- a/redback-users/redback-users-providers/redback-users-cached/src/main/resources/META-INF/spring-context.xml
+++ b/redback-users/redback-users-providers/redback-users-cached/src/main/resources/META-INF/spring-context.xml
@@ -31,7 +31,7 @@
   <context:component-scan 
     base-package="org.apache.archiva.redback.users.cached"/>
 
-  <bean name="cache#users" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#users" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>
diff --git a/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml b/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
index 47aeee0e..54ef336b 100644
--- a/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
+++ b/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
@@ -32,7 +32,7 @@
     <property name="usersCache" ref="cache#users"/>
   </bean>
 
-  <bean name="cache#users" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#users" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>
diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/main/resources/META-INF/spring-context.xml b/redback-users/redback-users-providers/redback-users-ldap/src/main/resources/META-INF/spring-context.xml
index 0cccd673..ac1384ce 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/src/main/resources/META-INF/spring-context.xml
+++ b/redback-users/redback-users-providers/redback-users-ldap/src/main/resources/META-INF/spring-context.xml
@@ -33,7 +33,7 @@
 
   <!-- REDBACK-289/MRM-1488 -->
   <!-- Cache for LDAP users. Data is refreshed every 3 mins. -->
-  <bean name="cache#ldapUser" class="org.codehaus.plexus.cache.ehcache.EhcacheCache">
+  <bean name="cache#ldapUser" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache">
     <property name="diskExpiryThreadIntervalSeconds" value="180"/>
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>
@@ -46,7 +46,7 @@
   </bean>
 
   <!-- Cache for users' LDAP userDn. Data is refreshed every 3 mins. -->
-  <bean name="cache#ldapUserDn" class="org.codehaus.plexus.cache.ehcache.EhcacheCache">
+  <bean name="cache#ldapUserDn" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache">
     <property name="diskExpiryThreadIntervalSeconds" value="180"/>
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>