killbill-aplcache

diff --git a/util/src/main/java/com/ning/billing/util/glue/TagStoreModule.java b/util/src/main/java/com/ning/billing/util/glue/TagStoreModule.java
index 039ce2b..7ac13d4 100644
--- a/util/src/main/java/com/ning/billing/util/glue/TagStoreModule.java
+++ b/util/src/main/java/com/ning/billing/util/glue/TagStoreModule.java
@@ -31,10 +31,14 @@ public class TagStoreModule extends AbstractModule
     @Override
     protected void configure()
     {
-        bind(Clock.class).to(DefaultClock.class).asEagerSingleton();
+        configureClock();
         bind(TagDefinitionSqlDao.class).toProvider(TagDescriptionDaoProvider.class).asEagerSingleton();
         bind(TagDefinitionDao.class).to(DefaultTagDefinitionDao.class).asEagerSingleton();
         bind(TagStoreSqlDao.class).toProvider(TagStoreDaoProvider.class).asEagerSingleton();
         bind(TagDefinitionUserApi.class).to(DefaultTagDefinitionUserApi.class).asEagerSingleton();
     }
+    
+    protected void configureClock() {
+    	install(new ClockModule());
+    }
 }

diff --git a/util/src/test/java/com/ning/billing/util/tag/TagStoreModuleMock.java b/util/src/test/java/com/ning/billing/util/tag/TagStoreModuleMock.java
index 9fc4c78..8d0ce05 100644
--- a/util/src/test/java/com/ning/billing/util/tag/TagStoreModuleMock.java
+++ b/util/src/test/java/com/ning/billing/util/tag/TagStoreModuleMock.java
@@ -17,8 +17,11 @@
 package com.ning.billing.util.tag;
 
 import java.io.IOException;
+
 import org.skife.jdbi.v2.IDBI;
+
 import com.ning.billing.dbi.MysqlTestingHelper;
+import com.ning.billing.util.glue.MockClockModule;
 import com.ning.billing.util.glue.TagStoreModule;
 
 public class TagStoreModuleMock extends TagStoreModule {
@@ -41,4 +44,9 @@ public class TagStoreModuleMock extends TagStoreModule {
         bind(IDBI.class).toInstance(helper.getDBI());
         super.configure();
     }
+    
+    @Override
+    protected void configureClock() {
+    	install(new MockClockModule());
+    }
 }