Index: openacs-4/packages/acs-admin/tcl/site-wide-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/Attic/site-wide-procs.tcl,v
diff -u -r1.1.2.5 -r1.1.2.6
--- openacs-4/packages/acs-admin/tcl/site-wide-procs.tcl	13 May 2020 19:29:28 -0000	1.1.2.5
+++ openacs-4/packages/acs-admin/tcl/site-wide-procs.tcl	19 May 2020 19:15:36 -0000	1.1.2.6
@@ -16,8 +16,7 @@
 
         @return package_id of the site_wide subsite
     } {
-        set key ::acs_admin::site_wide_subsite
-        if {![info exists $key]} {
+        return [acs::per_thread_cache eval -key acs-admin.site_wide_subsite {
             set subsite_name site-wide
             set subsite_parent /acs-admin
             set subsite_path $subsite_parent/$subsite_name
@@ -33,9 +32,8 @@
                                     -package_name $subsite_name \
                                     -package_key acs-subsite]
             }
-            set $key $subsite_id
-        }
-        return [set $key]
+            set subsite_id
+        }]
     }
 
     ad_proc require_site_wide_package {