Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl,v
diff -u -N -r1.141.2.12 -r1.141.2.13
--- openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl	17 Feb 2020 08:48:31 -0000	1.141.2.12
+++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl	27 Feb 2020 21:48:39 -0000	1.141.2.13
@@ -1437,6 +1437,10 @@
                 ::acs::site_nodes_cache eval -partition_key 0 package_url-$package_key { next }
             }
 
+            :method flush_per_request_cache {} {
+                array unset ::__node_id
+            }
+
             :public method flush_pattern {{-partition_key ""} pattern} {
                 #
                 # Flush from the site-nodes caches certain
@@ -1446,14 +1450,17 @@
                 # above. Depending on the specified pattern, it
                 # reroutes the flushing request to different caches.
                 #
+
+                :flush_per_request_cache
+                
                 switch -glob -- $pattern {
                     id-*           {set cache site_nodes_id_cache}
                     get_children-* {set cache site_nodes_children_cache}
                     default        {set cache site_nodes_cache}
                 }
                 ::acs::$cache flush_pattern -partition_key $partition_key $pattern
             }
-
+            
             :public method flush_cache {-node_id:required,1..1 {-with_subtree:boolean true} {-url ""}} {
                 #
                 # Flush entries from site-node tree, including the current node,
@@ -1462,10 +1469,7 @@
                 # the whole tree.
                 #
 
-                #
-                # In any case, flush as well the per-request cache
-                #
-                array unset ::__node_id
+                :flush_per_request_cache
 
                 set old_url [:get_url -node_id $node_id]