diff --git a/source/java/org/alfresco/web/bean/TemplateSupportBean.java b/source/java/org/alfresco/web/bean/TemplateSupportBean.java
index b129bc8d98..b2f42ec0d9 100644
--- a/source/java/org/alfresco/web/bean/TemplateSupportBean.java
+++ b/source/java/org/alfresco/web/bean/TemplateSupportBean.java
@@ -31,13 +31,13 @@ import javax.faces.context.FacesContext;
 import javax.faces.model.SelectItem;
 
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.cache.ExpiringValueCache;
 import org.alfresco.repo.security.permissions.AccessDeniedException;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.util.ExpiringValueCache;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.bean.repository.Repository;
diff --git a/source/java/org/alfresco/web/bean/preview/BasePreviewBean.java b/source/java/org/alfresco/web/bean/preview/BasePreviewBean.java
index 18df50eb48..84ef8a702a 100644
--- a/source/java/org/alfresco/web/bean/preview/BasePreviewBean.java
+++ b/source/java/org/alfresco/web/bean/preview/BasePreviewBean.java
@@ -32,7 +32,6 @@ import javax.faces.context.FacesContext;
 import javax.faces.model.SelectItem;
 
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.cache.ExpiringValueCache;
 import org.alfresco.repo.security.permissions.AccessDeniedException;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.repository.FileTypeImageSize;
diff --git a/source/java/org/alfresco/web/bean/search/SearchProperties.java b/source/java/org/alfresco/web/bean/search/SearchProperties.java
index a403458825..f3074f9d94 100644
--- a/source/java/org/alfresco/web/bean/search/SearchProperties.java
+++ b/source/java/org/alfresco/web/bean/search/SearchProperties.java
@@ -34,9 +34,9 @@ import javax.faces.model.DataModel;
 import javax.faces.model.ListDataModel;
 import javax.faces.model.SelectItem;
 
-import org.alfresco.repo.cache.ExpiringValueCache;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.util.ExpiringValueCache;
 import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.config.AdvancedSearchConfigElement;
 
diff --git a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
index da41845c8f..af62b79667 100644
--- a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
@@ -42,7 +42,6 @@ import org.alfresco.model.ApplicationModel;
 import org.alfresco.model.ContentModel;
 import org.alfresco.model.WCMAppModel;
 import org.alfresco.repo.avm.AVMNodeConverter;
-import org.alfresco.repo.cache.ExpiringValueCache;
 import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.avm.locking.AVMLockingService;
 import org.alfresco.service.cmr.model.FileInfo;
@@ -60,6 +59,7 @@ import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
 import org.alfresco.util.DNSNameMangler;
+import org.alfresco.util.ExpiringValueCache;
 import org.alfresco.web.app.AlfrescoNavigationHandler;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.app.servlet.FacesHelper;
diff --git a/source/java/org/alfresco/web/config/ClientConfigElement.java b/source/java/org/alfresco/web/config/ClientConfigElement.java
index a902186e4e..72a25ea2c7 100644
--- a/source/java/org/alfresco/web/config/ClientConfigElement.java
+++ b/source/java/org/alfresco/web/config/ClientConfigElement.java
@@ -32,8 +32,8 @@ import org.alfresco.config.ConfigElement;
 import org.alfresco.config.JNDIConstants;
 import org.alfresco.config.element.ConfigElementAdapter;
 import org.alfresco.mbeans.VirtServerRegistry;
-import org.alfresco.repo.cache.ExpiringValueCache;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.util.ExpiringValueCache;
 import org.alfresco.web.bean.repository.Repository;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;