diff --git a/source/java/org/alfresco/repo/lock/mem/LockStoreImpl.java b/source/java/org/alfresco/repo/lock/mem/LockStoreImpl.java
index 8819f11e75..4e9994ee69 100644
--- a/source/java/org/alfresco/repo/lock/mem/LockStoreImpl.java
+++ b/source/java/org/alfresco/repo/lock/mem/LockStoreImpl.java
@@ -24,7 +24,8 @@ import java.util.concurrent.TimeUnit;
 import org.alfresco.repo.lock.LockServiceImpl;
 import org.alfresco.service.cmr.repository.NodeRef;
 
-import com.google.common.collect.MapMaker;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 
 /**
  * {@link LockStore} implementation backed by a Google {@link ConcurrentMap}.
@@ -53,10 +54,10 @@ public class LockStoreImpl extends AbstractLockStore<ConcurrentMap<NodeRef, Lock
     
     private static ConcurrentMap<NodeRef, LockState> createMap(long expiry, TimeUnit timeUnit)
     {
-        ConcurrentMap<NodeRef, LockState> map = new MapMaker()
+        Cache<NodeRef, LockState> cache = CacheBuilder.newBuilder()
                     .concurrencyLevel(32)
-                    .expiration(expiry, timeUnit)
-                    .makeMap();
-        return map;
+                    .expireAfterWrite(expiry, timeUnit)
+                    .build();
+        return cache.asMap();
     }
 }