diff --git a/zero.Core/Database/ZeroStore.cs b/zero.Core/Database/ZeroStore.cs
index 76ea4623..7c2b2bba 100644
--- a/zero.Core/Database/ZeroStore.cs
+++ b/zero.Core/Database/ZeroStore.cs
@@ -63,6 +63,8 @@ namespace zero.Core.Database
       RegisterEvents(session);
       AfterSessionCreated(session);
 
+      session.Advanced.DocumentStore.AggressivelyCacheFor(TimeSpan.FromHours(1), options.Database);
+
       return session;
     }
 
@@ -88,6 +90,8 @@ namespace zero.Core.Database
       RegisterEvents(session);
       AfterSessionCreated(session);
 
+      session.Advanced.DocumentStore.AggressivelyCacheFor(TimeSpan.FromHours(1), options.Database);
+
       return session;
     }
 
diff --git a/zero.Web/ZeroBuilder.cs b/zero.Web/ZeroBuilder.cs
index 3b94c17a..b6f42e38 100644
--- a/zero.Web/ZeroBuilder.cs
+++ b/zero.Web/ZeroBuilder.cs
@@ -151,14 +151,14 @@ namespace zero.Web
         IDocumentStore store = new ZeroStore(options)
         {
           Urls = new string[1] { options.Raven.Url },
-          //Conventions = // TODO activate and test this
-          //{            
-          //  AggressiveCache =
-          //  {
-          //    Duration = TimeSpan.FromDays(1),
-          //    Mode = AggressiveCacheMode.TrackChanges
-          //  }
-          //}
+          Conventions = // TODO activate and test this
+          {
+            AggressiveCache =
+            {
+              Duration = TimeSpan.FromHours(1),
+              Mode = AggressiveCacheMode.TrackChanges
+            }
+          }
         };
 
         conventionsBuilder.Run(store.Conventions);