diff --git a/repository/src/main/resources/alfresco/cache-context.xml b/repository/src/main/resources/alfresco/cache-context.xml
index 24e2500fcb..a04dbbbc72 100644
--- a/repository/src/main/resources/alfresco/cache-context.xml
+++ b/repository/src/main/resources/alfresco/cache-context.xml
@@ -501,4 +501,9 @@
    <bean name="hbClusterUsageCache" factory-bean="cacheFactory" factory-method="createCache">
       <constructor-arg value="cache.hbClusterUsageCache"/>
    </bean>
+
+    <!-- The cross-transaction shared cache for query accelerator configuration -->
+    <bean name="queryAcceleratorCache" factory-bean="cacheFactory" factory-method="createCache">
+        <constructor-arg value="cache.queryAcceleratorCache"/>
+    </bean>
 </beans>
diff --git a/repository/src/main/resources/alfresco/caches.properties b/repository/src/main/resources/alfresco/caches.properties
index 5e4ae5f249..fb58b12919 100644
--- a/repository/src/main/resources/alfresco/caches.properties
+++ b/repository/src/main/resources/alfresco/caches.properties
@@ -686,3 +686,16 @@ cache.hbClusterUsageCache.backup-count=1
 cache.hbClusterUsageCache.eviction-policy=NONE
 cache.hbClusterUsageCache.merge-policy=com.hazelcast.map.merge.PutIfAbsentMapMergePolicy
 cache.hbClusterUsageCache.readBackupData=false
+
+
+#
+# Query accelerator cluster cache
+#
+cache.queryAcceleratorCache.maxItems=1000
+cache.queryAcceleratorCache.timeToLiveSeconds=0
+cache.queryAcceleratorCache.maxIdleSeconds=0
+cache.queryAcceleratorCache.cluster.type=fully-distributed
+cache.queryAcceleratorCache.backup-count=1
+cache.queryAcceleratorCache.eviction-policy=NONE
+cache.queryAcceleratorCache.merge-policy=com.hazelcast.map.merge.LatestUpdateMapMergePolicy
+cache.queryAcceleratorCache.readBackupData=false