diff --git a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
index ec14dbe9c4..35cb5192e6 100644
--- a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
+++ b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
@@ -142,6 +142,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
+import sonia.scm.cache.GuavaCacheManager;
 
 /**
  *
@@ -272,8 +273,8 @@ public class ScmServletModule extends ServletModule
     bind(WebSecurityContext.class).to(BasicSecurityContext.class);
     bind(AdministrationContext.class, DefaultAdministrationContext.class);
 
-    // bind security cache
-    bind(CacheManager.class, EhCacheManager.class);
+    // bind cache
+    bind(CacheManager.class, GuavaCacheManager.class);
 
     // bind dao
     bind(GroupDAO.class, XmlGroupDAO.class);