diff --git a/platform/persistence/cache/bundle.json b/platform/persistence/cache/bundle.json
new file mode 100644
index 0000000000..dbb30842c8
--- /dev/null
+++ b/platform/persistence/cache/bundle.json
@@ -0,0 +1,14 @@
+{
+    "name": "Persistence cache",
+    "description": "Cache to improve availability of persisted objects.",
+    "extensions": {
+        "components": [
+            {
+                "provides": "persistenceService",
+                "type": "decorator",
+                "implementation": "CachingPersistenceDecorator.js",
+                "depends": [ "PERSISTENCE_SPACE" ]
+            }
+        ]
+    }
+}
diff --git a/platform/persistence/couch/src/CachingPersistenceDecorator.js b/platform/persistence/cache/src/CachingPersistenceDecorator.js
similarity index 100%
rename from platform/persistence/couch/src/CachingPersistenceDecorator.js
rename to platform/persistence/cache/src/CachingPersistenceDecorator.js
diff --git a/platform/persistence/couch/test/CachingPersistenceDecoratorSpec.js b/platform/persistence/cache/test/CachingPersistenceDecoratorSpec.js
similarity index 100%
rename from platform/persistence/couch/test/CachingPersistenceDecoratorSpec.js
rename to platform/persistence/cache/test/CachingPersistenceDecoratorSpec.js
diff --git a/platform/persistence/cache/test/suite.json b/platform/persistence/cache/test/suite.json
new file mode 100644
index 0000000000..0e8b777ca1
--- /dev/null
+++ b/platform/persistence/cache/test/suite.json
@@ -0,0 +1,3 @@
+[
+    "CachingPersistenceDecorator"
+]
diff --git a/platform/persistence/couch/test/suite.json b/platform/persistence/couch/test/suite.json
index 3beda3a01d..f61febc916 100644
--- a/platform/persistence/couch/test/suite.json
+++ b/platform/persistence/couch/test/suite.json
@@ -1,6 +1,5 @@
 [
-    "CachingPersistenceDecorator",
     "CouchDocument",
     "CouchIndicator",
     "CouchPersistenceProvider"
-]
\ No newline at end of file
+]