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 -N -r1.114.2.8 -r1.114.2.9
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	13 May 2020 08:05:09 -0000	1.114.2.8
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	18 May 2020 21:13:20 -0000	1.114.2.9
@@ -1216,19 +1216,13 @@
 ad_proc -public apm_package_key_from_id {package_id} {
     @return The package key of the instance.
 } {
-    set key ::acs::apm_package_key_from_id($package_id)
-    if {[info exists $key]} {return [set $key]}
-    set $key [apm_package_key_from_id_not_cached $package_id]
+    return [acs::per_thread_cache eval -key acs-tcl:apm_package_key_from_id($package_id) {
+        db_string apm_package_key_from_id {
+            select package_key from apm_packages where package_id = :package_id
+        } -default ""
+    }]
 }
 
-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 {
-        select package_key from apm_packages where package_id = :package_id
-    } -default ""]
-}
-
 #
 # package_id -> instance_name
 #