diff --git a/config/alfresco/cache-context.xml b/config/alfresco/cache-context.xml
index 7a2d0b79da..bac83fe525 100644
--- a/config/alfresco/cache-context.xml
+++ b/config/alfresco/cache-context.xml
@@ -619,4 +619,40 @@
       </property>
    </bean>
    
+   <!-- ===================================== -->
+   <!-- Web Scripts Caches                    -->
+   <!-- ===================================== -->
+
+   <!-- The cross-transaction shared cache for In-Memory WebScripts Registry -->
+   
+   <bean name="webScriptsRegistrySharedCache" class="org.alfresco.repo.cache.EhCacheAdapter">
+      <property name="cache">
+         <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean" >
+            <property name="cacheManager">
+               <ref bean="internalEHCacheManager" />
+            </property>
+            <property name="cacheName">
+               <value>org.alfresco.cache.webScriptsRegistryCache</value>
+            </property>
+         </bean>
+      </property>
+   </bean>
+   
+   <!-- The transactional cache for In-Memory WebScripts Registry -->
+   
+   <bean name="webScriptsRegistryCache" class="org.alfresco.repo.cache.TransactionalCache">
+      <property name="sharedCache">
+         <ref bean="webScriptsRegistrySharedCache" />
+      </property>
+      <property name="cacheManager" >
+         <ref bean="transactionalEHCacheManager" />
+      </property>
+      <property name="name">
+         <value>org.alfresco.webScriptsRegistryTransactionalCache</value>
+      </property>
+      <property name="maxCacheSize">
+         <value>10</value>
+      </property>
+   </bean>
+   
 </beans>
\ No newline at end of file
diff --git a/config/alfresco/ehcache-default.xml b/config/alfresco/ehcache-default.xml
index d639cc1cd4..6e734bb280 100644
--- a/config/alfresco/ehcache-default.xml
+++ b/config/alfresco/ehcache-default.xml
@@ -427,4 +427,13 @@
         overflowToDisk="false"
         />
         
+    <!-- Web Scripts Registry -->
+    
+    <cache 
+        name="org.alfresco.cache.webScriptsRegistryCache"
+        maxElementsInMemory="100"
+        eternal="true"
+        overflowToDisk="false"
+        />
+             
 </ehcache>
\ No newline at end of file
diff --git a/config/alfresco/extension/ehcache-custom.xml.sample.cluster b/config/alfresco/extension/ehcache-custom.xml.sample.cluster
index fc87ee2f07..4e29e7fbca 100644
--- a/config/alfresco/extension/ehcache-custom.xml.sample.cluster
+++ b/config/alfresco/extension/ehcache-custom.xml.sample.cluster
@@ -761,5 +761,23 @@
                                  replicateAsynchronously = false"/>
 
     </cache>
-            
+         
+    <!-- Web Scripts Registry -->
+    
+    <cache 
+        name="org.alfresco.cache.webScriptsRegistryCache"
+        maxElementsInMemory="100"
+        eternal="true"
+        overflowToDisk="false">
+        
+             <cacheEventListenerFactory
+                     class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
+                     properties="replicatePuts = false,
+                                 replicateUpdates = true,
+                                 replicateRemovals = true,
+                                 replicateUpdatesViaCopy = false,
+                                 replicateAsynchronously = false"/>
+
+    </cache>
+       
 </ehcache>