diff --git a/src/akonadi/akonadicontextqueries.h b/src/akonadi/akonadicontextqueries.h
--- a/src/akonadi/akonadicontextqueries.h
+++ b/src/akonadi/akonadicontextqueries.h
@@ -27,6 +27,7 @@
 
 #include "domain/contextqueries.h"
 
+#include "akonadi/akonadicache.h"
 #include "akonadi/akonadilivequeryhelpers.h"
 #include "akonadi/akonadilivequeryintegrator.h"
 
@@ -49,14 +50,16 @@
 
     ContextQueries(const StorageInterface::Ptr &storage,
                    const SerializerInterface::Ptr &serializer,
-                   const MonitorInterface::Ptr &monitor);
+                   const MonitorInterface::Ptr &monitor,
+                   const Cache::Ptr &cache);
 
 
     ContextResult::Ptr findAll() const Q_DECL_OVERRIDE;
     TaskResult::Ptr findTopLevelTasks(Domain::Context::Ptr context) const Q_DECL_OVERRIDE;
 
 private:
     SerializerInterface::Ptr m_serializer;
+    Cache::Ptr m_cache;
     LiveQueryHelpers::Ptr m_helpers;
     LiveQueryIntegrator::Ptr m_integrator;
 
diff --git a/src/akonadi/akonadicontextqueries.cpp b/src/akonadi/akonadicontextqueries.cpp
--- a/src/akonadi/akonadicontextqueries.cpp
+++ b/src/akonadi/akonadicontextqueries.cpp
@@ -28,8 +28,10 @@
 
 ContextQueries::ContextQueries(const StorageInterface::Ptr &storage,
                                const SerializerInterface::Ptr &serializer,
-                               const MonitorInterface::Ptr &monitor)
+                               const MonitorInterface::Ptr &monitor,
+                               const Cache::Ptr &cache)
     : m_serializer(serializer),
+      m_cache(cache),
       m_helpers(new LiveQueryHelpers(serializer, storage)),
       m_integrator(new LiveQueryIntegrator(serializer, monitor))
 {
diff --git a/src/zanshin/app/dependencies.cpp b/src/zanshin/app/dependencies.cpp
--- a/src/zanshin/app/dependencies.cpp
+++ b/src/zanshin/app/dependencies.cpp
@@ -64,7 +64,8 @@
     deps.add<Domain::ContextQueries,
              Akonadi::ContextQueries(Akonadi::StorageInterface*,
                                      Akonadi::SerializerInterface*,
-                                     Akonadi::MonitorInterface*)>();
+                                     Akonadi::MonitorInterface*,
+                                     Akonadi::Cache*)>();
 
     deps.add<Domain::ContextRepository,
              Akonadi::ContextRepository(Akonadi::StorageInterface*,
diff --git a/tests/units/akonadi/akonadicontextqueriestest.cpp b/tests/units/akonadi/akonadicontextqueriestest.cpp
--- a/tests/units/akonadi/akonadicontextqueriestest.cpp
+++ b/tests/units/akonadi/akonadicontextqueriestest.cpp
@@ -23,6 +23,7 @@
 
 #include <testlib/qtest_zanshin.h>
 
+#include "akonadi/akonadicachingstorage.h"
 #include "akonadi/akonadicontextqueries.h"
 #include "akonadi/akonadiserializer.h"
 
@@ -37,6 +38,12 @@
 class AkonadiContextQueriesTest : public QObject
 {
     Q_OBJECT
+private:
+    Akonadi::StorageInterface::Ptr createCachingStorage(AkonadiFakeData &data, const Akonadi::Cache::Ptr &cache)
+    {
+        auto storage = Akonadi::StorageInterface::Ptr(data.createStorage());
+        return Akonadi::StorageInterface::Ptr(new Akonadi::CachingStorage(cache, storage));
+    }
 
 private slots:
     void shouldDealWithEmptyTagList()
@@ -47,7 +54,8 @@
         // WHEN
         QScopedPointer<Domain::ContextQueries> queries(new Akonadi::ContextQueries(Akonadi::StorageInterface::Ptr(data.createStorage()),
                                                                                    Akonadi::Serializer::Ptr(new Akonadi::Serializer),
-                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor())));
+                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor()),
+                                                                                   Akonadi::Cache::Ptr()));
         auto result = queries->findAll();
 
         // THEN
@@ -69,7 +77,8 @@
         // WHEN
         QScopedPointer<Domain::ContextQueries> queries(new Akonadi::ContextQueries(Akonadi::StorageInterface::Ptr(data.createStorage()),
                                                                                    Akonadi::Serializer::Ptr(new Akonadi::Serializer),
-                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor())));
+                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor()),
+                                                                                   Akonadi::Cache::Ptr()));
         auto result = queries->findAll();
         result->data();
         result = queries->findAll(); // Should not cause any problem or wrong data
@@ -95,7 +104,8 @@
         // WHEN
         QScopedPointer<Domain::ContextQueries> queries(new Akonadi::ContextQueries(Akonadi::StorageInterface::Ptr(data.createStorage()),
                                                                                    Akonadi::Serializer::Ptr(new Akonadi::Serializer),
-                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor())));
+                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor()),
+                                                                                   Akonadi::Cache::Ptr()));
         auto result = queries->findAll();
         result->data();
         result = queries->findAll(); // Should not cause any problem or wrong data
@@ -115,7 +125,8 @@
 
         QScopedPointer<Domain::ContextQueries> queries(new Akonadi::ContextQueries(Akonadi::StorageInterface::Ptr(data.createStorage()),
                                                                                    Akonadi::Serializer::Ptr(new Akonadi::Serializer),
-                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor())));
+                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor()),
+                                                                                   Akonadi::Cache::Ptr()));
         auto result = queries->findAll();
         TestHelpers::waitForEmptyJobQueue();
         QVERIFY(result->data().isEmpty());
@@ -141,7 +152,8 @@
 
         QScopedPointer<Domain::ContextQueries> queries(new Akonadi::ContextQueries(Akonadi::StorageInterface::Ptr(data.createStorage()),
                                                                                    Akonadi::Serializer::Ptr(new Akonadi::Serializer),
-                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor())));
+                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor()),
+                                                                                   Akonadi::Cache::Ptr()));
         auto result = queries->findAll();
         QVERIFY(result->data().isEmpty());
         TestHelpers::waitForEmptyJobQueue();
@@ -166,7 +178,8 @@
 
         QScopedPointer<Domain::ContextQueries> queries(new Akonadi::ContextQueries(Akonadi::StorageInterface::Ptr(data.createStorage()),
                                                                                    Akonadi::Serializer::Ptr(new Akonadi::Serializer),
-                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor())));
+                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor()),
+                                                                                   Akonadi::Cache::Ptr()));
         auto result = queries->findAll();
         QVERIFY(result->data().isEmpty());
         TestHelpers::waitForEmptyJobQueue();
@@ -199,9 +212,11 @@
 
         // WHEN
         auto serializer = Akonadi::SerializerInterface::Ptr(new Akonadi::Serializer);
-        QScopedPointer<Domain::ContextQueries> queries(new Akonadi::ContextQueries(Akonadi::StorageInterface::Ptr(data.createStorage()),
+        auto cache = Akonadi::Cache::Ptr::create(serializer, Akonadi::MonitorInterface::Ptr(data.createMonitor()));
+        QScopedPointer<Domain::ContextQueries> queries(new Akonadi::ContextQueries(createCachingStorage(data, cache),
                                                                                    Akonadi::Serializer::Ptr(new Akonadi::Serializer),
-                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor())));
+                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor()),
+                                                                                   cache));
 
         auto context = serializer->createContextFromTag(data.tag(42));
         auto result = queries->findTopLevelTasks(context);
@@ -237,9 +252,11 @@
         data.createTag(GenTag().withId(42).withName(QStringLiteral("42")).asContext());
 
         auto serializer = Akonadi::SerializerInterface::Ptr(new Akonadi::Serializer);
-        QScopedPointer<Domain::ContextQueries> queries(new Akonadi::ContextQueries(Akonadi::StorageInterface::Ptr(data.createStorage()),
+        auto cache = Akonadi::Cache::Ptr::create(serializer, Akonadi::MonitorInterface::Ptr(data.createMonitor()));
+        QScopedPointer<Domain::ContextQueries> queries(new Akonadi::ContextQueries(createCachingStorage(data, cache),
                                                                                    Akonadi::Serializer::Ptr(new Akonadi::Serializer),
-                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor())));
+                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor()),
+                                                                                   cache));
 
         auto context = serializer->createContextFromTag(data.tag(42));
         auto result = queries->findTopLevelTasks(context);
@@ -269,9 +286,11 @@
         data.createItem(GenTodo().withParent(42).withId(42).withTitle(QStringLiteral("42")).withTags({42}));
 
         auto serializer = Akonadi::SerializerInterface::Ptr(new Akonadi::Serializer);
-        QScopedPointer<Domain::ContextQueries> queries(new Akonadi::ContextQueries(Akonadi::StorageInterface::Ptr(data.createStorage()),
+        auto cache = Akonadi::Cache::Ptr::create(serializer, Akonadi::MonitorInterface::Ptr(data.createMonitor()));
+        QScopedPointer<Domain::ContextQueries> queries(new Akonadi::ContextQueries(createCachingStorage(data, cache),
                                                                                    Akonadi::Serializer::Ptr(new Akonadi::Serializer),
-                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor())));
+                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor()),
+                                                                                   cache));
 
         auto context = serializer->createContextFromTag(data.tag(42));
         auto result = queries->findTopLevelTasks(context);
@@ -308,9 +327,11 @@
         data.createItem(GenTodo().withParent(42).withId(42).withTitle(QStringLiteral("42")));
 
         auto serializer = Akonadi::SerializerInterface::Ptr(new Akonadi::Serializer);
-        QScopedPointer<Domain::ContextQueries> queries(new Akonadi::ContextQueries(Akonadi::StorageInterface::Ptr(data.createStorage()),
+        auto cache = Akonadi::Cache::Ptr::create(serializer, Akonadi::MonitorInterface::Ptr(data.createMonitor()));
+        QScopedPointer<Domain::ContextQueries> queries(new Akonadi::ContextQueries(createCachingStorage(data, cache),
                                                                                    Akonadi::Serializer::Ptr(new Akonadi::Serializer),
-                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor())));
+                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor()),
+                                                                                   cache));
 
         auto context = serializer->createContextFromTag(data.tag(42));
         auto result = queries->findTopLevelTasks(context);
@@ -340,9 +361,11 @@
         data.createItem(GenTodo().withParent(42).withId(42).withTitle(QStringLiteral("42")).withTags({42}));
 
         auto serializer = Akonadi::SerializerInterface::Ptr(new Akonadi::Serializer);
-        QScopedPointer<Domain::ContextQueries> queries(new Akonadi::ContextQueries(Akonadi::StorageInterface::Ptr(data.createStorage()),
+        auto cache = Akonadi::Cache::Ptr::create(serializer, Akonadi::MonitorInterface::Ptr(data.createMonitor()));
+        QScopedPointer<Domain::ContextQueries> queries(new Akonadi::ContextQueries(createCachingStorage(data, cache),
                                                                                    Akonadi::Serializer::Ptr(new Akonadi::Serializer),
-                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor())));
+                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor()),
+                                                                                   cache));
 
         auto context = serializer->createContextFromTag(data.tag(42));
         auto result = queries->findTopLevelTasks(context);
@@ -372,9 +395,11 @@
         data.createItem(GenTodo().withParent(42).withId(42).withTitle(QStringLiteral("42")).withTags({42}));
 
         auto serializer = Akonadi::SerializerInterface::Ptr(new Akonadi::Serializer);
-        QScopedPointer<Domain::ContextQueries> queries(new Akonadi::ContextQueries(Akonadi::StorageInterface::Ptr(data.createStorage()),
+        auto cache = Akonadi::Cache::Ptr::create(serializer, Akonadi::MonitorInterface::Ptr(data.createMonitor()));
+        QScopedPointer<Domain::ContextQueries> queries(new Akonadi::ContextQueries(createCachingStorage(data, cache),
                                                                                    Akonadi::Serializer::Ptr(new Akonadi::Serializer),
-                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor())));
+                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor()),
+                                                                                   cache));
 
         auto context1 = serializer->createContextFromTag(data.tag(42));
         auto result1 = queries->findTopLevelTasks(context1);
@@ -410,9 +435,11 @@
 
 
         auto serializer = Akonadi::SerializerInterface::Ptr(new Akonadi::Serializer);
-        QScopedPointer<Domain::ContextQueries> queries(new Akonadi::ContextQueries(Akonadi::StorageInterface::Ptr(data.createStorage()),
-                                                                                   serializer,
-                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor())));
+        auto cache = Akonadi::Cache::Ptr::create(serializer, Akonadi::MonitorInterface::Ptr(data.createMonitor()));
+        QScopedPointer<Domain::ContextQueries> queries(new Akonadi::ContextQueries(createCachingStorage(data, cache),
+                                                                                   Akonadi::Serializer::Ptr(new Akonadi::Serializer),
+                                                                                   Akonadi::MonitorInterface::Ptr(data.createMonitor()),
+                                                                                   cache));
 
         auto context = serializer->createContextFromTag(data.tag(42));
         auto result = queries->findTopLevelTasks(context);