Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl,v
diff -u -r1.67 -r1.68
--- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	11 Dec 2018 11:26:26 -0000	1.67
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	11 Feb 2019 11:45:19 -0000	1.68
@@ -1301,7 +1301,7 @@
     return $result
 }
 
-ad_proc -private subsite::util::packages_no_mem {
+ad_proc -private subsite::util::packages_no_cache {
     -node_id
 } {
     return a list of package_id's for children of the passed node_id
@@ -1338,7 +1338,7 @@
                              -include_self \
                              -element node_id]
 
-    return [util_memoize [list subsite::util::packages_no_mem -node_id $subsite_node_id] 1200]
+    return [util_memoize [list subsite::util::packages_no_cache -node_id $subsite_node_id] 1200]
 }
 
 ad_proc -public subsite::util::get_package_options {
Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v
diff -u -r1.113 -r1.114
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	28 Sep 2018 08:40:15 -0000	1.113
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	11 Feb 2019 11:50:04 -0000	1.114
@@ -1245,10 +1245,10 @@
 } {
     set key ::acs::apm_package_key_from_id($package_id)
     if {[info exists $key]} {return [set $key]}
-    set $key [apm_package_key_from_id_mem $package_id]
+    set $key [apm_package_key_from_id_not_cached $package_id]
 }
 
-ad_proc -private apm_package_key_from_id_mem {package_id} {
+ad_proc -private apm_package_key_from_id_not_cached {package_id} {
     unmemoized version of apm_package_key_from_id
 } {
     return [db_string apm_package_key_from_id {
@@ -1263,10 +1263,10 @@
 ad_proc -public apm_instance_name_from_id {package_id} {
     @return The name of the instance.
 } {
-    return [util_memoize [list apm_instance_name_from_id_mem $package_id]]
+    return [util_memoize [list apm_instance_name_from_id_not_cached $package_id]]
 }
 
-ad_proc -private apm_instance_name_from_id_mem {package_id} {
+ad_proc -private apm_instance_name_from_id_not_cached {package_id} {
     unmemoized version of apm_instance_name_from_id
 } {
     return [db_string apm_package_instance_name_from_id {
@@ -1285,15 +1285,15 @@
 } {
     set var ::apm::package_id_from_key($package_key)
     if {[info exists $var]} {return [set $var]}
-    set result [util_memoize [list apm_package_id_from_key_mem $package_key]]
-    #set result [ns_cache_eval ns:memoize apm_package_id_from_key_$package_key [list apm_package_id_from_key_mem $package_key]]
+    set result [util_memoize [list apm_package_id_from_key_not_cached $package_key]]
+    #set result [ns_cache_eval ns:memoize apm_package_id_from_key_$package_key [list apm_package_id_from_key_not_cached $package_key]]
     if {$result != 0} {
         set $var $result
     }
     return $result
 }
 
-ad_proc -private apm_package_id_from_key_mem {package_key} {
+ad_proc -private apm_package_id_from_key_not_cached {package_key} {
     unmemoized version of apm_package_id_from_key
 } {
     return [db_string apm_package_id_from_key {
@@ -1311,10 +1311,10 @@
     @return List of package ids of all instances of the package.
     Empty string
 } {
-    return [util_memoize [list apm_package_ids_from_key_mem -package_key $package_key -mounted_p $mounted_p]]
+    return [util_memoize [list apm_package_ids_from_key_not_cached -package_key $package_key -mounted_p $mounted_p]]
 }
 
-ad_proc -private apm_package_ids_from_key_mem {
+ad_proc -private apm_package_ids_from_key_not_cached {
     -package_key:required
     {-mounted_p "0"}
 } {
@@ -1396,11 +1396,11 @@
 
     @author Peter Marklund (peter@collaboraid.biz)
 } {
-    return [util_memoize [list apm_package_key_from_version_id_mem $version_id]]
+    return [util_memoize [list apm_package_key_from_version_id_not_cached $version_id]]
 
 }
 
-ad_proc -private apm_package_key_from_version_id_mem {version_id} {
+ad_proc -private apm_package_key_from_version_id_not_cached {version_id} {
     Returns the package_key for the given APM package version id. Goes to the database
     every time called.
 
@@ -2171,7 +2171,7 @@
 
 } {
     db_dml update_package_key {}
-    util_memoize_flush "apm_package_key_from_id_mem $package_id"
+    util_memoize_flush "apm_package_key_from_id_not_cached $package_id"
 
     set node_id [site_node::get_node_id_from_object_id -object_id $package_id]
     if { $node_id ne "" } {
Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v
diff -u -r1.152 -r1.153
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	7 Feb 2019 18:03:19 -0000	1.152
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	11 Feb 2019 11:51:43 -0000	1.153
@@ -1315,7 +1315,7 @@
 }
 
 
-ad_proc -private ad_acs_kernel_id_mem {} {
+ad_proc -private ad_acs_kernel_id_not_cached {} {
 
     Returns the package_id of the kernel. (not cached)
 
@@ -1328,7 +1328,7 @@
 ad_proc -public ad_acs_kernel_id {} {
     Returns the package_id of the kernel.
 } {
-    set acs_kernel_id [ad_acs_kernel_id_mem]
+    set acs_kernel_id [ad_acs_kernel_id_not_cached]
     #
     # use proc rather than ad_proc on redefine since we don't want to see a
     # multiple define proc warning...