Index: openacs-4/packages/acs-templating/tcl/paginator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/paginator-procs.tcl,v
diff -u -N -r1.31 -r1.32
--- openacs-4/packages/acs-templating/tcl/paginator-procs.tcl	9 May 2018 15:33:29 -0000	1.31
+++ openacs-4/packages/acs-templating/tcl/paginator-procs.tcl	11 Jun 2018 22:04:00 -0000	1.32
@@ -100,10 +100,10 @@
     template::util::get_opts $args
 
     set cache_key	$name:$query
-    set row_ids [cache get $cache_key:row_ids]
+    set row_ids [template::cache get $cache_key:row_ids]
 
     # full number of rows returned by original paginator query
-    set full_row_count [cache get $cache_key:full_row_count]
+    set full_row_count [template::cache get $cache_key:full_row_count]
 
     #
     # GN: In the following line, we had instead of [::cache exists
@@ -117,7 +117,7 @@
     # recommended. Unfortunately, several places in OpenACS have this
     # problem.
     #
-    if { ($row_ids eq {} && ![::cache exists $cache_key])
+    if { ($row_ids eq {} && ![template::cache exists $cache_key])
          || ([info exists opts(flush_p)] && $opts(flush_p) == "t")
     } {
         if { [info exists opts(printing_prefs)] && $opts(printing_prefs) ne "" } {
@@ -170,7 +170,7 @@
     } else {
         set opts(row_ids) $row_ids
         set opts(full_row_count) $full_row_count
-        set opts(context_ids) [cache get $cache_key:context_ids]
+        set opts(context_ids) [template::cache get $cache_key:context_ids]
     }
 
     set opts(row_count) [llength $opts(row_ids)]
@@ -269,11 +269,11 @@
         }
 
         set properties(context_ids) $context_ids
-        cache set $name:$query:context_ids $context_ids $properties(timeout)
+        template::cache set $name:$query:context_ids $context_ids $properties(timeout)
 
         set properties(row_ids) $row_ids
 
-        cache set $name:$query:row_ids $row_ids $properties(timeout)
+        template::cache set $name:$query:row_ids $row_ids $properties(timeout)
 
     } else {
 
@@ -308,13 +308,13 @@
         "
 
         set properties(row_ids) $ids
-        cache set $name:$query:row_ids $ids $properties(timeout)
+        template::cache set $name:$query:row_ids $ids $properties(timeout)
     }
 
     # Get full number of rows retrieved by original paginator query
     set full_row_count [uplevel 3 [list db_string query [db_map count_query]]]
     set properties(full_row_count) $full_row_count
-    cache set $name:$query:full_row_count $full_row_count $properties(timeout)
+    template::cache set $name:$query:full_row_count $full_row_count $properties(timeout)
 }
 
 ad_proc -public template::paginator::get_page { name rownum } {
@@ -841,8 +841,8 @@
 ad_proc -public template::paginator::reset { name query } {
     Resets the cache for a query.
 } {
-    cache flush $name:$query:context_ids
-    cache flush $name:$query:row_ids
+    template::cache flush $name:$query:context_ids
+    template::cache flush $name:$query:row_ids
 }
 
 ad_proc -private template::paginator::get_reference {} {
Index: openacs-4/packages/acs-templating/tcl/query-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/query-procs.tcl,v
diff -u -N -r1.46 -r1.47
--- openacs-4/packages/acs-templating/tcl/query-procs.tcl	18 May 2018 07:56:07 -0000	1.46
+++ openacs-4/packages/acs-templating/tcl/query-procs.tcl	11 Jun 2018 22:04:00 -0000	1.47
@@ -1020,12 +1020,12 @@
     return $result
 }
 
-# Generic caching
+# Generic template caching
 
 nsv_set __template_cache_value . .
 nsv_set __template_cache_timeout . .
 
-ad_proc -public cache { command cache_key args } {
+ad_proc -public template::cache { command cache_key args } {
     Generic Caching
 } {
 
@@ -1082,7 +1082,7 @@
                 set names [ns_cache names template_cache]
                 foreach name $names {
                     if { [string match $cache_key $name] } {
-                        ns_log debug "cache: FLUSHING CACHE: $name"
+                        ns_log debug "template::cache: FLUSHING CACHE: $name"
                         ns_cache flush template_cache $name
                     }
                 }
@@ -1109,7 +1109,7 @@
         }
 
         default {
-            error "Invalid command option to cache: must be get or set."
+            error "Invalid command option to template::cache: must be get or set."
         }
 
     }
Index: openacs-4/packages/forums/tcl/forums-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-procs.tcl,v
diff -u -N -r1.31 -r1.32
--- openacs-4/packages/forums/tcl/forums-procs.tcl	11 Jun 2018 14:04:10 -0000	1.31
+++ openacs-4/packages/forums/tcl/forums-procs.tcl	11 Jun 2018 22:04:00 -0000	1.32
@@ -132,7 +132,7 @@
 } {
     # DRB: Black magic cache flush call which will disappear when list builder is
     # rewritten to paginate internally rather than use the template paginator.
-    cache flush "messages,forum_id=$forum_id*"
+    template::cache flush "messages,forum_id=$forum_id*"
 }
 
 ad_proc -deprecated -public forum::posting_policy_set {