Index: openacs-4/packages/acs-tcl/tcl/apm-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-init.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-tcl/tcl/apm-init.tcl	7 Aug 2017 23:47:59 -0000	1.3
+++ openacs-4/packages/acs-tcl/tcl/apm-init.tcl	2 Sep 2021 17:10:27 -0000	1.3.2.1
@@ -12,6 +12,18 @@
 nsv_array set apm_package_info [list]
 nsv_set apm_properties reload_level 0
 
+namespace eval apm {
+
+    # Cache the singleton_p property of all packages.
+    db_foreach get_singleton {
+        select package_key, singleton_p
+        from apm_package_types
+    } {
+        set ::apm::package_singleton_p($package_key) $singleton_p
+    }
+
+}
+
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4