Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -r1.225 -r1.226
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	11 Jun 2018 18:47:26 -0000	1.225
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	27 Jun 2018 12:07:09 -0000	1.226
@@ -410,15 +410,15 @@
     #
     # Get the HTML from the rendered includelet by calling "next"
     #
-    set HTML [ns_cache eval xowiki_cache $key next]
+    set HTML [::xowiki::cache eval -partition_key ${:package_id} $key next]
     #
     # Some side-effects might be necessary, even when the HTML output
     # of the includelet is cached (e.g. some associative arrays,
     # etc.).  For this purpose, we provide here a means to cache
     # additional some "includelet data", if the includelet provides
     # it.
     #
-    if {[catch {set data [ns_cache get xowiki_cache $key-data]}]} {
+    if {[catch {set data [::xowiki::cache get -partition_key ${:package_id} $key-data]}]} {
       :cache_includelet_data $key-data
     } else {
       #:msg "eval $data"
@@ -428,9 +428,12 @@
   } -instproc cache_includelet_data {key} {
     #:msg "data=[next]"
     set data [next]
-    if {$data ne ""} {ns_cache set xowiki_cache $key $data}
+    if {$data ne ""} {
+      ::xowiki::cache set -partition_key ${:package_id} $key $data
+    }
   }
 }
+
 namespace eval ::xowiki::includelet {
   #############################################################################
   # dotlrn style includelet decoration for includelets
@@ -4485,7 +4488,11 @@
 
     set cmd [list ::xowiki::includelet::random-form-page page_names $package_id $form $publish_status]
     if {[ns_info name] eq "NaviServer"} {
-      set names [ns_cache_eval -expires $expires xowiki_cache random-$package_id-$form $cmd]
+      set names [::xowiki::cache \
+                     -expires $expires \
+                     -partition_key $package_id \
+                     random-$package_id-$form \
+                     $cmd]
     } else {
       set names [util_memoize $cmd]
     }