Index: openacs-4/packages/xotcl-core/xotcl-core.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/xotcl-core.info,v
diff -u -r1.92.2.24 -r1.92.2.25
--- openacs-4/packages/xotcl-core/xotcl-core.info	3 Feb 2017 12:52:00 -0000	1.92.2.24
+++ openacs-4/packages/xotcl-core/xotcl-core.info	10 Feb 2017 12:01:43 -0000	1.92.2.25
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xotcl</auto-mount>
 
-    <version name="0.155" url="http://media.wu-wien.ac.at/download/xotcl-core-0.155.apm">
+    <version name="0.156" url="http://media.wu-wien.ac.at/download/xotcl-core-0.156.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>XOTcl library functionality (e.g. thread handling, online documentation, Generic Form and List Classes)</summary>
         <release-date>2016-09-10</release-date>
@@ -43,7 +43,7 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xotcl-core" version="0.155"/>
+        <provides url="xotcl-core" version="0.156"/>
 	<requires url="acs-kernel" version="5.9.1d20"/>
 	<requires url="acs-templating" version="5.9.1d7"/>
 	<requires url="acs-api-browser" version="5.9.1d1"/>
Index: openacs-4/packages/xotcl-core/tcl/cr-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/cr-procs.tcl,v
diff -u -r1.54.2.17 -r1.54.2.18
--- openacs-4/packages/xotcl-core/tcl/cr-procs.tcl	29 Nov 2016 22:11:32 -0000	1.54.2.17
+++ openacs-4/packages/xotcl-core/tcl/cr-procs.tcl	10 Feb 2017 12:01:43 -0000	1.54.2.18
@@ -17,6 +17,7 @@
         {mime_type text/plain}
         {storage_type "text"}
         {folder_id -100}
+        {non_cached_instance_var_patterns {__*}}
       } -ad_doc {
         <p>The meta class CrClass serves for a class of applications that mostly 
         store information in the content repository and that use a few 
@@ -1632,29 +1633,45 @@
 
   ::xotcl::Class create CrCache::Item
   CrCache::Item set name_pattern {^::[0-9]+$}
+  
   CrCache::Item instproc remove_non_persistent_vars {} {
-    # we do not want to save __db__artefacts in the cache
-    foreach x [my info vars __db_*] {my unset $x}
-    # remove as well vars and array starting with "__", assuming these
-    # are volatile variables created by initialize_loaded_object or
-    # similar mechanisms
+    #
+    # Do not save __db__artefacts in the cache.
+    #
+    foreach x [info vars :__db_*] {
+      unset :$x
+    }
+    #
+    # Remove vars and arrays matching the class-specific specified
+    # non_cached_instance_var_patterns and treat these as variables,
+    # which are not stored in the cache, but which are kept in the
+    # instance variables. These variables are removed before caching
+    # and restored afterwards.
+    #
     set arrays {}
     set scalars {}
-    foreach x [my info vars __*] {
-      if {[my array exists $x]} {
-        lappend arrays $x [my array get $x]
-        my array unset $x
+    set non_cached_vars {}
+    foreach pattern [[my info class] non_cached_instance_var_patterns] {
+      lappend non_cached_vars {*}[info vars :$pattern]
+    }
+    
+    #puts stderr "pattern [[my info class] non_cached_instance_var_patterns], non_cached_vars=$non_cached_vars"
+    foreach x $non_cached_vars {
+      if {[array exists :$x]} {
+        lappend arrays $x [array get :$x]
+        array unset :$x
       } {
-        lappend scalars $x [my set $x]
-        my unset $x
+        lappend scalars $x [set :$x]
+        unset :$x
       }
     }
     return [list $arrays $scalars]
   }
+  
   CrCache::Item instproc set_non_persistent_vars {vars} {
     lassign $vars arrays scalars
     foreach {var value} $arrays {my array set $var $value}
-    foreach {var value} $scalars {my set $var $value}
+    :mset $scalars
   }
   CrCache::Item instproc flush_from_cache_and_refresh {} {
     # cache only names with IDs