Index: openacs-4/packages/xowf/tcl/xowf-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/xowf-procs.tcl,v
diff -u -r1.28.2.51 -r1.28.2.52
--- openacs-4/packages/xowf/tcl/xowf-procs.tcl	5 Apr 2021 18:02:55 -0000	1.28.2.51
+++ openacs-4/packages/xowf/tcl/xowf-procs.tcl	21 Apr 2021 11:01:13 -0000	1.28.2.52
@@ -380,6 +380,11 @@
 
   Context instproc set_current_state {value} {
     set :current_state ${:wf_container}::$value
+    if {[info exists :form_obj] && [:isobject ::${:form_obj}]} {
+      # The form object in the cache is still that from the previous
+      # state, make sure we flush it.
+      ::${:form_obj} destroy
+    }
   }
 
   Context instproc get_current_state {} {