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.14 -r1.131.2.15
--- openacs-4/packages/acs-subsite/acs-subsite.info	3 May 2020 17:00:57 -0000	1.131.2.14
+++ openacs-4/packages/acs-subsite/acs-subsite.info	13 May 2020 10:28:38 -0000	1.131.2.15
@@ -9,7 +9,7 @@
     <implements-subsite-p>t</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
 
-    <version name="5.10.0d21" url="http://openacs.org/repository/download/apm/acs-subsite-5.10.0d21.apm">
+    <version name="5.10.0d22" url="http://openacs.org/repository/download/apm/acs-subsite-5.10.0d22.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.0d21"/>
+        <provides url="acs-subsite" version="5.10.0d22"/>
         <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.0d32"/>
+        <requires url="acs-tcl" version="5.10.0d33"/>
         <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.1 -r1.12.2.2
--- openacs-4/packages/acs-subsite/www/admin/host-node-map/index.tcl	16 May 2019 09:54:29 -0000	1.12.2.1
+++ openacs-4/packages/acs-subsite/www/admin/host-node-map/index.tcl	13 May 2020 10:28:38 -0000	1.12.2.2
@@ -87,8 +87,8 @@
     }
 } -on_submit {
     util_memoize_flush_regexp "rp_lookup_node_from_host"
-    db_flush_cache -cache_key_pattern security-locations-host-names
-    db_flush_cache -cache_key_pattern ad_get_host_node_map
+    acs::site_nodes_id_cache flush security-locations-host-names
+    acs::site_nodes_id_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.9 -r1.95.2.10
--- openacs-4/packages/acs-tcl/acs-tcl.info	3 May 2020 16:32:10 -0000	1.95.2.9
+++ openacs-4/packages/acs-tcl/acs-tcl.info	13 May 2020 10:28:38 -0000	1.95.2.10
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="5.10.0d32" url="http://openacs.org/repository/download/apm/acs-tcl-5.10.0d32.apm">
+    <version name="5.10.0d33" url="http://openacs.org/repository/download/apm/acs-tcl-5.10.0d33.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.0d32"/>
+        <provides url="acs-tcl" version="5.10.0d33"/>
         <requires url="acs-bootstrap-installer" version="5.10.0d6"/>
         <requires url="acs-kernel" version="5.10.0d0"/>
 
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.26 -r1.126.2.27
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	8 May 2020 12:58:52 -0000	1.126.2.26
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	13 May 2020 10:28:38 -0000	1.126.2.27
@@ -885,11 +885,12 @@
     # assumes that the host-node-map is always short. This allows us
     # as well to purge the entries without a pattern match.
     #
-    set lists [db_list_of_lists -cache_key ad_get_host_node_map \
-                  get_node_host_names {select host, node_id from host_node_map}]
-    set p [lsearch -index 0 -exact $lists $hostname]
+    set mapping [acs::site_nodes_id_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]
     if {$p != -1} {
-        set result [lindex $lists $p 1]
+        set result [lindex $mapping $p 1]
     } else {
         set result 0
     }
@@ -2382,9 +2383,9 @@
     #
     # Add locations from host_node_map
     #
-    set host_node_map_hosts_list [db_list -cache_key security-locations-host-names \
-                                      get_node_host_names {select host from host_node_map}]
-
+    set host_node_map_hosts_list [acs::site_nodes_id_cache eval security-locations-host-names { 
+        db_list get_node_host_names get_node_host_names {select host from host_node_map}
+    }]
     if { [llength $host_node_map_hosts_list] > 0 } {
         if { $suppress_http_port } {
             foreach hostname $host_node_map_hosts_list {