Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -N -r1.131.2.16 -r1.131.2.17
--- openacs-4/packages/acs-subsite/acs-subsite.info	19 May 2020 19:15:36 -0000	1.131.2.16
+++ openacs-4/packages/acs-subsite/acs-subsite.info	22 May 2020 12:18:19 -0000	1.131.2.17
@@ -9,7 +9,7 @@
     <implements-subsite-p>t</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
 
-    <version name="5.10.0d23" url="http://openacs.org/repository/download/apm/acs-subsite-5.10.0d23.apm">
+    <version name="5.10.0d24" url="http://openacs.org/repository/download/apm/acs-subsite-5.10.0d24.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Subsite</summary>
         <release-date>2017-08-06</release-date>
@@ -18,11 +18,11 @@
         <license>GPL</license>
         <maturity>3</maturity>
 
-        <provides url="acs-subsite" version="5.10.0d23"/>
+        <provides url="acs-subsite" version="5.10.0d24"/>
         <requires url="acs-authentication" version="5.10.0d5"/>
         <requires url="acs-content-repository" version="5.9.1"/>
         <requires url="acs-kernel" version="5.9.1"/>
-        <requires url="acs-tcl" version="5.10.0d35"/>
+        <requires url="acs-tcl" version="5.10.0d36"/>
         <requires url="acs-lang" version="5.9.1"/>
         <requires url="acs-mail-lite" version="5.9.1"/>
 
Index: openacs-4/packages/acs-subsite/www/admin/host-node-map/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/host-node-map/index.tcl,v
diff -u -N -r1.12.2.2 -r1.12.2.3
--- openacs-4/packages/acs-subsite/www/admin/host-node-map/index.tcl	13 May 2020 10:28:38 -0000	1.12.2.2
+++ openacs-4/packages/acs-subsite/www/admin/host-node-map/index.tcl	22 May 2020 12:18:19 -0000	1.12.2.3
@@ -87,8 +87,8 @@
     }
 } -on_submit {
     util_memoize_flush_regexp "rp_lookup_node_from_host"
-    acs::site_nodes_id_cache flush security-locations-host-names
-    acs::site_nodes_id_cache flush ad_get_host_node_map
+    acs::misc_cache flush security-locations-host-names
+    acs::misc_cache flush ad_get_host_node_map
 
     db_dml host_node_insert {}
 } -after_submit {
Index: openacs-4/packages/acs-tcl/acs-tcl.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/acs-tcl.info,v
diff -u -N -r1.95.2.12 -r1.95.2.13
--- openacs-4/packages/acs-tcl/acs-tcl.info	19 May 2020 19:15:36 -0000	1.95.2.12
+++ openacs-4/packages/acs-tcl/acs-tcl.info	22 May 2020 12:18:19 -0000	1.95.2.13
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="5.10.0d35" url="http://openacs.org/repository/download/apm/acs-tcl-5.10.0d35.apm">
+    <version name="5.10.0d36" url="http://openacs.org/repository/download/apm/acs-tcl-5.10.0d36.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>The Kernel Tcl API library.</summary>
         <release-date>2017-08-06</release-date>
@@ -18,7 +18,7 @@
         <license>GPL version 2</license>
         <maturity>3</maturity>
 
-        <provides url="acs-tcl" version="5.10.0d35"/>
+        <provides url="acs-tcl" version="5.10.0d36"/>
         <requires url="acs-bootstrap-installer" version="5.10.0d6"/>
         <requires url="acs-kernel" version="5.10.0d0"/>
 
Index: openacs-4/packages/acs-tcl/tcl/acs-cache-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/acs-cache-init.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-tcl/tcl/acs-cache-init.tcl	22 May 2020 12:18:19 -0000	1.1.2.1
@@ -0,0 +1,10 @@
+#
+# The acs::misc_cache is a potential successor of the util_memoize_cache, 
+# but in a partioned fashion to make it scaleable. It should only be
+# used for situation, where not wild-card flushes are required.
+#
+set cacheType [expr {[::acs::icanuse "ns_hash"] ? "HashKeyPartitionedCache" : "Cache"}]
+::acs::$cacheType create ::acs::misc_cache \
+    -package_key acs-tcl \
+    -parameter MiscCache \
+    -default_size 100000
Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v
diff -u -N -r1.126.2.29 -r1.126.2.30
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	19 May 2020 19:15:37 -0000	1.126.2.29
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	22 May 2020 12:18:19 -0000	1.126.2.30
@@ -885,7 +885,7 @@
     # assumes that the host-node-map is always short. This allows us
     # as well to purge the entries without a pattern match.
     #
-    set mapping [acs::site_nodes_id_cache eval ad_get_host_node_map { 
+    set mapping [acs::misc_cache eval ad_get_host_node_map { 
         db_list_of_lists get_node_host_names {select host, node_id from host_node_map}
     }]
     set p [lsearch -index 0 -exact $mapping $hostname]
@@ -2383,7 +2383,7 @@
     #
     # Add locations from host_node_map
     #
-    set host_node_map_hosts_list [acs::site_nodes_id_cache eval security-locations-host-names { 
+    set host_node_map_hosts_list [acs::misc_cache eval security-locations-host-names { 
         db_list get_node_host_names {select host from host_node_map}
     }]
     if { [llength $host_node_map_hosts_list] > 0 } {