diff --git a/build.xml b/build.xml
index 15222528..d562a987 100644
--- a/build.xml
+++ b/build.xml
@@ -424,6 +424,7 @@
           <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" kind="cl" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
+          <module ref="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" kind="cl" />
           <module ref="96ee7a94-411d-4cf8-9b94-96cad7e52411(jetbrains.mps.baseLanguage.jdk7)" kind="cl" />
           <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
@@ -662,6 +663,7 @@
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
+          <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
           <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="cl" />
@@ -2425,6 +2427,7 @@
           <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" kind="cl" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
+          <module ref="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" kind="cl" />
           <module ref="96ee7a94-411d-4cf8-9b94-96cad7e52411(jetbrains.mps.baseLanguage.jdk7)" kind="cl" />
           <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
@@ -2663,6 +2666,7 @@
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
+          <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
           <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="cl" />
@@ -5311,7 +5315,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.coderules.template" depends="java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.coderules.template" depends="java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -5324,20 +5328,21 @@
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-context.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index 32fca566..1ed4f503 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -1680,6 +1680,95 @@
       <ref role="2VPoh2" node="5EDW3XF62FH" resolve="Manifest" />
       <ref role="2sBCQV" node="5EDW3XF64MJ" resolve="manifest" />
     </node>
+    <node concept="3aamgX" id="5HVB6JR7JqW" role="3acgRq">
+      <ref role="30HIoZ" to="wq2x:6PWFJfGbjLY" resolve="MemoExpression" />
+      <node concept="1Koe21" id="5HVB6JR7KJv" role="1lVwrX">
+        <node concept="3clFb_" id="5HVB6JR7KJw" role="1Koe22">
+          <property role="TrG5h" value="context" />
+          <node concept="37vLTG" id="5HVB6JR7KJx" role="3clF46">
+            <property role="TrG5h" value="session" />
+            <node concept="3uibUv" id="5HVB6JR7KJy" role="1tU5fm">
+              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+            </node>
+          </node>
+          <node concept="3Tm6S6" id="5HVB6JR7KJz" role="1B3o_S" />
+          <node concept="3cqZAl" id="5HVB6JR7KJ$" role="3clF45" />
+          <node concept="3clFbS" id="5HVB6JR7KJ_" role="3clF47">
+            <node concept="3clFbH" id="5HVB6JR7KJA" role="3cqZAp" />
+            <node concept="3clFbF" id="5HVB6JR7KJB" role="3cqZAp">
+              <node concept="2OqwBi" id="5HVB6JR7KJC" role="3clFbG">
+                <node concept="liA8E" id="5HVB6JR7KJD" role="2OqNvi">
+                  <ref role="37wK5l" to="i348:5HVB6JR7NAD" resolve="memoize" />
+                  <node concept="10Nm6u" id="5HVB6JR8u3o" role="37wK5m">
+                    <node concept="29HgVG" id="5HVB6JR8u8z" role="lGtFl">
+                      <node concept="3NFfHV" id="5HVB6JR8u8$" role="3NFExx">
+                        <node concept="3clFbS" id="5HVB6JR8u8_" role="2VODD2">
+                          <node concept="3clFbF" id="5HVB6JR8u8F" role="3cqZAp">
+                            <node concept="2OqwBi" id="5HVB6JR8u8A" role="3clFbG">
+                              <node concept="3TrEf2" id="5HVB6JR8u8D" role="2OqNvi">
+                                <ref role="3Tt5mk" to="wq2x:6PWFJfGbjSW" resolve="key" />
+                              </node>
+                              <node concept="30H73N" id="5HVB6JR8u8E" role="2Oq$k0" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="10Nm6u" id="5HVB6JR8uvL" role="37wK5m">
+                    <node concept="29HgVG" id="5HVB6JR8u$m" role="lGtFl">
+                      <node concept="3NFfHV" id="5HVB6JR8u$n" role="3NFExx">
+                        <node concept="3clFbS" id="5HVB6JR8u$o" role="2VODD2">
+                          <node concept="3clFbF" id="5HVB6JR8u$u" role="3cqZAp">
+                            <node concept="2OqwBi" id="5HVB6JR8u$p" role="3clFbG">
+                              <node concept="3TrEf2" id="5HVB6JR8u$s" role="2OqNvi">
+                                <ref role="3Tt5mk" to="wq2x:6PWFJfGbjSY" resolve="valueProvider" />
+                              </node>
+                              <node concept="30H73N" id="5HVB6JR8u$t" role="2Oq$k0" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTw" id="5HVB6JR7KJR" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5HVB6JR7KJx" resolve="session" />
+                  <node concept="1ZhdrF" id="5HVB6JR7KJS" role="lGtFl">
+                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                    <property role="2qtEX8" value="variableDeclaration" />
+                    <node concept="3$xsQk" id="5HVB6JR7KJT" role="3$ytzL">
+                      <node concept="3clFbS" id="5HVB6JR7KJU" role="2VODD2">
+                        <node concept="3clFbF" id="5HVB6JR7KJV" role="3cqZAp">
+                          <node concept="2OqwBi" id="5HVB6JR7KJW" role="3clFbG">
+                            <node concept="1iwH7S" id="5HVB6JR7KJX" role="2Oq$k0" />
+                            <node concept="1iwH70" id="5HVB6JR7KJY" role="2OqNvi">
+                              <ref role="1iwH77" node="429xoypVg6q" resolve="apply_session_parameter" />
+                              <node concept="2OqwBi" id="5HVB6JR7KJZ" role="1iwH7V">
+                                <node concept="30H73N" id="5HVB6JR7KK0" role="2Oq$k0" />
+                                <node concept="2Xjw5R" id="5HVB6JR7KK1" role="2OqNvi">
+                                  <node concept="1xMEDy" id="5HVB6JR7KK2" role="1xVPHs">
+                                    <node concept="chp4Y" id="5HVB6JR7KK3" role="ri$Ld">
+                                      <ref role="cht4Q" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="raruj" id="5HVB6JR7KK4" role="lGtFl" />
+            </node>
+            <node concept="3clFbH" id="5HVB6JR7KK5" role="3cqZAp" />
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="1pmfR0" id="4vbeH84AvBw">
     <property role="TrG5h" value="init_tracking" />
@@ -16910,9 +16999,6 @@
     <node concept="3clFb_" id="5EDW3XF62NQ" role="jymVt">
       <property role="TrG5h" value="programSpecBuilder" />
       <node concept="3Tm1VV" id="5EDW3XF62NS" role="1B3o_S" />
-      <node concept="3uibUv" id="5tAk4yVYcvv" role="3clF45">
-        <ref role="3uigEE" to="i348:5tAk4yVWROK" resolve="ProgramSpecBuilder" />
-      </node>
       <node concept="3clFbS" id="5EDW3XF62NU" role="3clF47">
         <node concept="3clFbF" id="5EDW3XF6$kS" role="3cqZAp">
           <node concept="2OqwBi" id="5tAk4yVYcSe" role="3clFbG">
@@ -16928,6 +17014,9 @@
       <node concept="2AHcQZ" id="5EDW3XF62NV" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
+      <node concept="3uibUv" id="5tAk4yVYcvv" role="3clF45">
+        <ref role="3uigEE" to="i348:5tAk4yVWROK" resolve="ProgramSpecBuilder" />
+      </node>
     </node>
     <node concept="2tJIrI" id="5EDW3XF6frs" role="jymVt" />
     <node concept="3clFb_" id="5EDW3XF6enC" role="jymVt">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
index 97d10066..6ef7c0bb 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
+++ b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
@@ -111,6 +111,7 @@
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)</dependency>
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
+    <dependency reexport="false">fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index c6d0a354..039d6cc9 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -28,6 +28,7 @@
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+    <import index="tp2c" ref="r:00000000-0000-4000-0000-011c89590338(jetbrains.mps.baseLanguage.closures.structure)" />
     <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.coderules.behavior)" implicit="true" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
   </imports>
@@ -78,6 +79,7 @@
       <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
       <concept id="1237385578942" name="jetbrains.mps.lang.editor.structure.IndentLayoutOnNewLineStyleClassItem" flags="ln" index="pVoyu" />
       <concept id="1233148810477" name="jetbrains.mps.lang.editor.structure.InlineStyleDeclaration" flags="ng" index="tppnM" />
+      <concept id="1177327274449" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_pattern" flags="nn" index="ub8z3" />
       <concept id="1177327570013" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_Substitute" flags="in" index="ucgPf" />
       <concept id="7671875129586001610" name="jetbrains.mps.lang.editor.structure.TransformationMenuPart_IncludeSubstituteMenu" flags="ng" index="ulPW2">
         <child id="6089045305656903122" name="menuReference" index="2ks2uz" />
@@ -8320,5 +8322,172 @@
     <node concept="3VyMlK" id="6mHZizzmuYs" role="3ft7WO" />
     <node concept="22hDWj" id="6mHZizzmu_J" role="22hAXT" />
   </node>
+  <node concept="24kQdi" id="6PWFJfGbjT1">
+    <ref role="1XX52x" to="wq2x:6PWFJfGbjLY" resolve="MemoExpression" />
+    <node concept="3EZMnI" id="6PWFJfGbjWm" role="2wV5jI">
+      <node concept="PMmxH" id="6PWFJfGbjWw" role="3EZMnx">
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+        <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
+      </node>
+      <node concept="3F0ifn" id="6PWFJfGbjWV" role="3EZMnx">
+        <property role="3F0ifm" value="(" />
+        <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
+      </node>
+      <node concept="3F1sOY" id="6PWFJfGbjWD" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:6PWFJfGbjSW" resolve="key" />
+      </node>
+      <node concept="3F0ifn" id="6PWFJfGbjX7" role="3EZMnx">
+        <property role="3F0ifm" value=")" />
+        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
+      </node>
+      <node concept="3F1sOY" id="6PWFJfGbjWL" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:6PWFJfGbjSY" resolve="valueProvider" />
+      </node>
+      <node concept="l2Vlx" id="6PWFJfGbjWp" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="3p309x" id="6PWFJfGbk0Y">
+    <property role="TrG5h" value="Memo" />
+    <node concept="1s_PAr" id="6PWFJfGbk64" role="3ft7WO">
+      <node concept="2kknPI" id="6PWFJfGbk67" role="1s_PAo">
+        <ref role="2kkw0f" node="6PWFJfGbk3L" resolve="MemoExpression_substitute" />
+      </node>
+    </node>
+    <node concept="2kknPJ" id="6PWFJfGbk3i" role="1IG6uw">
+      <ref role="2ZyFGn" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
+  </node>
+  <node concept="22mcaB" id="6PWFJfGbk3L">
+    <ref role="aqKnT" to="wq2x:6PWFJfGbjLY" resolve="MemoExpression" />
+    <node concept="22hDWg" id="6PWFJfGbk6_" role="22hAXT">
+      <property role="TrG5h" value="MemoExpression_substitute" />
+    </node>
+    <node concept="3eGOop" id="6PWFJfGbk91" role="3ft7WO">
+      <node concept="16NL3D" id="5HVB6JR6pQ3" role="upBLP">
+        <node concept="16Na2f" id="5HVB6JR6pQ5" role="16NL3A">
+          <node concept="3clFbS" id="5HVB6JR6pQ7" role="2VODD2">
+            <node concept="3clFbF" id="5HVB6JR6pUS" role="3cqZAp">
+              <node concept="1Wc70l" id="5HVB6JRb9MD" role="3clFbG">
+                <node concept="2OqwBi" id="5HVB6JRbaiR" role="3uHU7B">
+                  <node concept="liA8E" id="5HVB6JRbaEr" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                    <node concept="ub8z3" id="5HVB6JRbaFG" role="37wK5m" />
+                  </node>
+                  <node concept="2OqwBi" id="5HVB6JRcnBc" role="2Oq$k0">
+                    <node concept="35c_gC" id="5HVB6JRcnBd" role="2Oq$k0">
+                      <ref role="35c_gD" to="wq2x:6PWFJfGbjLY" resolve="MemoExpression" />
+                    </node>
+                    <node concept="3n3YKJ" id="5HVB6JRcnBe" role="2OqNvi" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="5HVB6JR6v_K" role="3uHU7w">
+                  <node concept="2OqwBi" id="5HVB6JR6q3s" role="2Oq$k0">
+                    <node concept="3bvxqY" id="5HVB6JR6pUR" role="2Oq$k0" />
+                    <node concept="2Xjw5R" id="5HVB6JR6vng" role="2OqNvi">
+                      <node concept="1xMEDy" id="5HVB6JR6vni" role="1xVPHs">
+                        <node concept="chp4Y" id="5HVB6JR6vnj" role="ri$Ld">
+                          <ref role="cht4Q" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
+                        </node>
+                      </node>
+                      <node concept="1xIGOp" id="5HVB6JR6vnk" role="1xVPHs" />
+                    </node>
+                  </node>
+                  <node concept="3x8VRR" id="5HVB6JR6vJ6" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="ucgPf" id="6PWFJfGbk92" role="3aKz83">
+        <node concept="3clFbS" id="6PWFJfGbk93" role="2VODD2">
+          <node concept="3cpWs8" id="6PWFJfGbxJI" role="3cqZAp">
+            <node concept="3cpWsn" id="6PWFJfGbxJJ" role="3cpWs9">
+              <property role="TrG5h" value="me" />
+              <node concept="3Tqbb2" id="6PWFJfGbxJu" role="1tU5fm">
+                <ref role="ehGHo" to="wq2x:6PWFJfGbjLY" resolve="MemoExpression" />
+              </node>
+              <node concept="2ShNRf" id="6PWFJfGbxJK" role="33vP2m">
+                <node concept="3zrR0B" id="6PWFJfGbxJL" role="2ShVmc">
+                  <node concept="3Tqbb2" id="6PWFJfGbxJM" role="3zrR0E">
+                    <ref role="ehGHo" to="wq2x:6PWFJfGbjLY" resolve="MemoExpression" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="5HVB6JR9eX9" role="3cqZAp">
+            <node concept="3cpWsn" id="5HVB6JR9eXa" role="3cpWs9">
+              <property role="TrG5h" value="cl" />
+              <node concept="3Tqbb2" id="5HVB6JR9eTr" role="1tU5fm">
+                <ref role="ehGHo" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
+              </node>
+              <node concept="2OqwBi" id="5HVB6JR9eXb" role="33vP2m">
+                <node concept="2OqwBi" id="5HVB6JR9eXc" role="2Oq$k0">
+                  <node concept="37vLTw" id="5HVB6JR9eXd" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6PWFJfGbxJJ" resolve="me" />
+                  </node>
+                  <node concept="3TrEf2" id="5HVB6JR9eXe" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:6PWFJfGbjSY" resolve="valueProvider" />
+                  </node>
+                </node>
+                <node concept="zfrQC" id="5HVB6JR9eXf" role="2OqNvi">
+                  <ref role="1A9B2P" to="tp2c:htbVj4_" resolve="ClosureLiteral" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6PWFJfGbwER" role="3cqZAp">
+            <node concept="2OqwBi" id="5HVB6JR9os$" role="3clFbG">
+              <node concept="2OqwBi" id="5HVB6JR9nMf" role="2Oq$k0">
+                <node concept="37vLTw" id="5HVB6JR9eXg" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5HVB6JR9eXa" resolve="cl" />
+                </node>
+                <node concept="3TrEf2" id="5HVB6JR9o8k" role="2OqNvi">
+                  <ref role="3Tt5mk" to="tp2c:htbW58J" resolve="body" />
+                </node>
+              </node>
+              <node concept="zfrQC" id="5HVB6JR9oNH" role="2OqNvi" />
+            </node>
+          </node>
+          <node concept="3clFbF" id="6PWFJfGbyQb" role="3cqZAp">
+            <node concept="37vLTw" id="6PWFJfGbyQ9" role="3clFbG">
+              <ref role="3cqZAo" node="6PWFJfGbxJJ" resolve="me" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="16NfWO" id="6PWFJfGb$1Z" role="upBLP">
+        <node concept="uGdhv" id="6PWFJfGb$3j" role="16NeZM">
+          <node concept="3clFbS" id="6PWFJfGb$3l" role="2VODD2">
+            <node concept="3clFbF" id="6PWFJfGb$7T" role="3cqZAp">
+              <node concept="2OqwBi" id="6PWFJfGb$7U" role="3clFbG">
+                <node concept="35c_gC" id="6PWFJfGb$7V" role="2Oq$k0">
+                  <ref role="35c_gD" to="wq2x:6PWFJfGbjLY" resolve="MemoExpression" />
+                </node>
+                <node concept="3n3YKJ" id="6PWFJfGb$7W" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="16NL0t" id="6PWFJfGbyRr" role="upBLP">
+        <node concept="uGdhv" id="6PWFJfGbyWB" role="16NL0q">
+          <node concept="3clFbS" id="6PWFJfGbyWD" role="2VODD2">
+            <node concept="3clFbF" id="6PWFJfGb$aV" role="3cqZAp">
+              <node concept="Xl_RD" id="6PWFJfGb$aU" role="3clFbG">
+                <property role="Xl_RC" value="store value by key in session" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3VyMlK" id="6PWFJfGbzVc" role="3ft7WO" />
+  </node>
+  <node concept="22mcaB" id="5HVB6JR3RPr">
+    <ref role="aqKnT" to="wq2x:6PWFJfGbjLY" resolve="MemoExpression" />
+    <node concept="22hDWj" id="5HVB6JR3RSJ" role="22hAXT" />
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index b268634e..bef806f3 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -1644,5 +1644,25 @@
       <ref role="AX2Wp" node="3czCaDvmnMw" resolve="FeedbackSeverity" />
     </node>
   </node>
+  <node concept="1TIwiD" id="6PWFJfGbjLY">
+    <property role="EcuMT" value="7889373009908939902" />
+    <property role="TrG5h" value="MemoExpression" />
+    <property role="34LRSv" value="memo" />
+    <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
+    <node concept="1TJgyj" id="6PWFJfGbjSW" role="1TKVEi">
+      <property role="IQ2ns" value="7889373009908940348" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="key" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
+    <node concept="1TJgyj" id="6PWFJfGbjSY" role="1TKVEi">
+      <property role="IQ2ns" value="7889373009908940350" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="valueProvider" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
index 1e653c3d..1e99b523 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
@@ -8677,6 +8677,7 @@
           <property role="TrG5h" value="P" />
         </node>
       </node>
+      <node concept="2tJIrI" id="7vRcs5$YXnG" role="jymVt" />
       <node concept="3clFb_" id="61G6TdDOcW_" role="jymVt">
         <property role="TrG5h" value="forEachInvalidated" />
         <node concept="37vLTG" id="61G6TdDOIKn" role="3clF46">
@@ -9676,6 +9677,37 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7DvO2Ma0gpD" role="jymVt" />
+    <node concept="3clFb_" id="6PWFJfG6VOq" role="jymVt">
+      <property role="TrG5h" value="withMemo" />
+      <node concept="37vLTG" id="6PWFJfG6VOr" role="3clF46">
+        <property role="TrG5h" value="memo" />
+        <node concept="3uibUv" id="6PWFJfG6VOs" role="1tU5fm">
+          <ref role="3uigEE" to="i348:6PWFJfG5LMK" resolve="Memo" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="6PWFJfG6Xbm" role="3clF45">
+        <ref role="3uigEE" node="7DvO2M9IiKB" resolve="MacroProcessing" />
+      </node>
+      <node concept="3Tm1VV" id="6PWFJfG6VOu" role="1B3o_S" />
+      <node concept="3clFbS" id="6PWFJfG6VOy" role="3clF47">
+        <node concept="3clFbF" id="6PWFJfG6VOA" role="3cqZAp">
+          <node concept="10QFUN" id="6PWFJfG6XPZ" role="3clFbG">
+            <node concept="3nyPlj" id="6PWFJfG6XPX" role="10QFUP">
+              <ref role="37wK5l" to="i348:6PWFJfG6OFJ" resolve="withMemo" />
+              <node concept="37vLTw" id="6PWFJfG6XPY" role="37wK5m">
+                <ref role="3cqZAo" node="6PWFJfG6VOr" resolve="memo" />
+              </node>
+            </node>
+            <node concept="3uibUv" id="6PWFJfG6YcN" role="10QFUM">
+              <ref role="3uigEE" node="7DvO2M9IiKB" resolve="MacroProcessing" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6PWFJfG6VOz" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="5DUvKnrzdJ3" role="jymVt" />
     <node concept="3clFb_" id="5itBwM7VEuy" role="jymVt">
       <property role="TrG5h" value="expandMacro" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
index 9ca591dc..567ef163 100644
--- a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
@@ -2424,6 +2424,11 @@
             <ref role="3bR37D" node="7BVjoXzUxkQ" resolve="jetbrains.mps.logic" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5HVB6JRnetC" role="3bR37C">
+          <node concept="3bR9La" id="5HVB6JRnetD" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6KZG" resolve="jetbrains.mps.baseLanguage.closures" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7BVjoXzUx9d" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -2519,6 +2524,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="5HVB6JRneu0" role="3bR37C">
+          <node concept="3bR9La" id="5HVB6JRneu1" role="1SiIV1">
+            <ref role="3bR37D" node="5wYq9r5EBDN" resolve="jetbrains.mps.coderules.runtime" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7BVjoXzUxee" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index dee026ca..5584d37d 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -131,7 +131,9 @@
       <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA">
         <property id="6468716278899126575" name="isVolatile" index="2dlcS1" />
       </concept>
-      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
+      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P">
+        <reference id="1182955020723" name="classConcept" index="1HBi2w" />
+      </concept>
       <concept id="1070475587102" name="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" flags="nn" index="XkiVB" />
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
@@ -285,6 +287,9 @@
         <child id="8276990574895933173" name="catchBody" index="1zc67A" />
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
+      <concept id="8276990574909231788" name="jetbrains.mps.baseLanguage.structure.FinallyClause" flags="ng" index="1wplmZ">
+        <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
+      </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
@@ -305,6 +310,7 @@
       </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="ng" index="3J1_TO">
         <child id="8276990574886367510" name="catchClause" index="1zxBo5" />
+        <child id="8276990574886367509" name="finallyClause" index="1zxBo6" />
         <child id="8276990574886367508" name="body" index="1zxBo7" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -750,6 +756,45 @@
           </node>
         </node>
       </node>
+      <node concept="2tJIrI" id="5HVB6JS6e_3" role="jymVt" />
+      <node concept="3clFb_" id="5HVB6JS6afJ" role="jymVt">
+        <property role="TrG5h" value="cleanLocal" />
+        <node concept="3uibUv" id="5HVB6JS6afK" role="3clF45">
+          <ref role="3uigEE" node="27bTNFfaJxq" resolve="TypecheckingTestHelper.Checker" />
+        </node>
+        <node concept="3Tm1VV" id="5HVB6JS6afL" role="1B3o_S" />
+        <node concept="3clFbS" id="5HVB6JS6afM" role="3clF47">
+          <node concept="3clFbF" id="5HVB6JS6mEw" role="3cqZAp">
+            <node concept="37vLTI" id="5HVB6JS6nrm" role="3clFbG">
+              <node concept="3clFbT" id="5HVB6JS6nsV" role="37vLTx">
+                <property role="3clFbU" value="true" />
+              </node>
+              <node concept="2OqwBi" id="5HVB6JS6mMv" role="37vLTJ">
+                <node concept="Xjq3P" id="5HVB6JS6mEu" role="2Oq$k0" />
+                <node concept="2OwXpG" id="5HVB6JS6mTO" role="2OqNvi">
+                  <ref role="2Oxat5" node="27bTNFfaWf5" resolve="ensureLocal" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="5HVB6JS6afN" role="3cqZAp">
+            <node concept="37vLTI" id="5HVB6JS6afO" role="3clFbG">
+              <node concept="3clFbT" id="5HVB6JS6mBb" role="37vLTx">
+                <property role="3clFbU" value="true" />
+              </node>
+              <node concept="2OqwBi" id="5HVB6JS6afQ" role="37vLTJ">
+                <node concept="Xjq3P" id="5HVB6JS6afR" role="2Oq$k0" />
+                <node concept="2OwXpG" id="5HVB6JS6mfi" role="2OqNvi">
+                  <ref role="2Oxat5" node="5HVB6JS62d5" resolve="cleanLocal" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="5HVB6JS6afT" role="3cqZAp">
+            <node concept="Xjq3P" id="5HVB6JS6afU" role="3clFbG" />
+          </node>
+        </node>
+      </node>
       <node concept="2tJIrI" id="2hrSdN969an" role="jymVt" />
       <node concept="3clFb_" id="2hrSdN96927" role="jymVt">
         <property role="TrG5h" value="ignoreErrorTypes" />
@@ -1917,6 +1962,63 @@
                             </node>
                           </node>
                         </node>
+                        <node concept="3clFbH" id="5HVB6JS3DZU" role="3cqZAp" />
+                        <node concept="3clFbJ" id="5HVB6JS5QaX" role="3cqZAp">
+                          <node concept="3clFbS" id="5HVB6JS5QaZ" role="3clFbx">
+                            <node concept="3clFbF" id="5HVB6JS3vc$" role="3cqZAp">
+                              <node concept="2OqwBi" id="5HVB6JS3ybA" role="3clFbG">
+                                <node concept="37vLTw" id="5HVB6JS3vcy" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="27bTNFfaZ1y" resolve="facade" />
+                                </node>
+                                <node concept="liA8E" id="5HVB6JS3_aN" role="2OqNvi">
+                                  <ref role="37wK5l" node="5HVB6JS1mjL" resolve="clearAllCaches" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3cpWs8" id="5HVB6JS3iYt" role="3cqZAp">
+                              <node concept="3cpWsn" id="5HVB6JS3iYu" role="3cpWs9">
+                                <property role="TrG5h" value="localTypeNoCache" />
+                                <node concept="3Tqbb2" id="5HVB6JS3iYv" role="1tU5fm" />
+                                <node concept="2OqwBi" id="5HVB6JS3iYw" role="33vP2m">
+                                  <node concept="37vLTw" id="5HVB6JS3iYx" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="27bTNFfaZ1y" resolve="facade" />
+                                  </node>
+                                  <node concept="liA8E" id="5HVB6JS3iYy" role="2OqNvi">
+                                    <ref role="37wK5l" node="1FOQehxnxRH" resolve="calcTypeLocally" />
+                                    <node concept="37vLTw" id="5HVB6JS3iYz" role="37wK5m">
+                                      <ref role="3cqZAo" node="27bTNFfaZ4Y" resolve="resolve" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3clFbF" id="5HVB6JS3iYl" role="3cqZAp">
+                              <node concept="1rXfSq" id="5HVB6JS3iYm" role="3clFbG">
+                                <ref role="37wK5l" node="4ZGicUZ1a_d" resolve="checkMatches" />
+                                <node concept="1LFfDK" id="5HVB6JS3iYn" role="37wK5m">
+                                  <node concept="3cmrfG" id="5HVB6JS3iYo" role="1LF_Uc">
+                                    <property role="3cmrfH" value="1" />
+                                  </node>
+                                  <node concept="37vLTw" id="5HVB6JS3iYp" role="1LFl5Q">
+                                    <ref role="3cqZAo" node="27bTNFfaZ6s" resolve="ref2type" />
+                                  </node>
+                                </node>
+                                <node concept="37vLTw" id="5HVB6JS3Ucj" role="37wK5m">
+                                  <ref role="3cqZAo" node="5HVB6JS3iYu" resolve="localTypeNoCache" />
+                                </node>
+                                <node concept="37vLTw" id="5HVB6JS3iYr" role="37wK5m">
+                                  <ref role="3cqZAo" node="27bTNFfaWf5" resolve="ensureLocal" />
+                                </node>
+                                <node concept="37vLTw" id="5HVB6JS3iYs" role="37wK5m">
+                                  <ref role="3cqZAo" node="4ZGicUZbFEv" resolve="nodeRef" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="37vLTw" id="5HVB6JS66tC" role="3clFbw">
+                            <ref role="3cqZAo" node="5HVB6JS62d5" resolve="cleanLocal" />
+                          </node>
+                        </node>
                       </node>
                       <node concept="1Wc70l" id="4ZGicUZjQhH" role="3clFbw">
                         <node concept="3clFbC" id="27bTNFfaZ6n" role="3uHU7B">
@@ -2518,6 +2620,12 @@
           <property role="3clFbU" value="true" />
         </node>
       </node>
+      <node concept="312cEg" id="5HVB6JS62d5" role="jymVt">
+        <property role="TrG5h" value="cleanLocal" />
+        <node concept="3Tm6S6" id="5HVB6JS62d6" role="1B3o_S" />
+        <node concept="10P_77" id="5HVB6JS62d7" role="1tU5fm" />
+        <node concept="3clFbT" id="5HVB6JS62d8" role="33vP2m" />
+      </node>
       <node concept="312cEg" id="4ZGicUZ3gOE" role="jymVt">
         <property role="TrG5h" value="matcherFactory" />
         <node concept="3Tm6S6" id="4ZGicUZ3gOF" role="1B3o_S" />
@@ -5901,7 +6009,7 @@
       </node>
       <node concept="3Tmbuc" id="61G6TdCrlVr" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="6nFpYluD3aC" role="jymVt" />
+    <node concept="2tJIrI" id="6PWFJfG5oiW" role="jymVt" />
     <node concept="Wx3nA" id="7i3KM7gAW2Y" role="jymVt">
       <property role="TrG5h" value="ORIGINS" />
       <node concept="3uibUv" id="7i3KM7gAW30" role="1tU5fm">
@@ -5926,9 +6034,36 @@
           </node>
         </node>
       </node>
-      <node concept="3Tmbuc" id="61G6TdCrnJL" role="1B3o_S" />
+      <node concept="3Tmbuc" id="6PWFJfG5BWT" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="7i3KM7g3qsY" role="jymVt" />
+    <node concept="2tJIrI" id="6PWFJfG5FIy" role="jymVt" />
+    <node concept="Wx3nA" id="6PWFJfG61KF" role="jymVt">
+      <property role="TrG5h" value="MEMO" />
+      <node concept="3uibUv" id="6PWFJfG61KG" role="1tU5fm">
+        <ref role="3uigEE" node="7i3KM7g1Lm1" resolve="SessionData.DataFlavour" />
+        <node concept="3uibUv" id="6PWFJfG6l1o" role="11_B2D">
+          <ref role="3uigEE" to="i348:6PWFJfG5LMK" resolve="Memo" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="6PWFJfG61KI" role="33vP2m">
+        <node concept="1pGfFk" id="6PWFJfG61KJ" role="2ShVmc">
+          <ref role="37wK5l" node="7i3KM7g1T3X" resolve="SessionData.DataFlavour" />
+          <node concept="3uibUv" id="6PWFJfG6ofG" role="1pMfVU">
+            <ref role="3uigEE" to="i348:6PWFJfG5LMK" resolve="Memo" />
+          </node>
+          <node concept="2OqwBi" id="6PWFJfG61KL" role="37wK5m">
+            <node concept="3VsKOn" id="6PWFJfG61KM" role="2Oq$k0">
+              <ref role="3VsUkX" to="i348:6PWFJfG5LMK" resolve="Memo" />
+            </node>
+            <node concept="liA8E" id="6PWFJfG61KN" role="2OqNvi">
+              <ref role="37wK5l" to="wyt6:~Class.getName()" resolve="getName" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tmbuc" id="6PWFJfG61KO" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="6PWFJfG61KE" role="jymVt" />
     <node concept="312cEu" id="6hpwxwitoJO" role="jymVt">
       <property role="TrG5h" value="Factory" />
       <node concept="2tJIrI" id="6hpwxwitBpL" role="jymVt" />
@@ -6845,6 +6980,39 @@
       </node>
     </node>
     <node concept="2tJIrI" id="1FOQehxnwar" role="jymVt" />
+    <node concept="3clFb_" id="5HVB6JS1mjL" role="jymVt">
+      <property role="TrG5h" value="clearAllCaches" />
+      <node concept="3cqZAl" id="5HVB6JS1mjO" role="3clF45" />
+      <node concept="3Tm1VV" id="5HVB6JS1mjP" role="1B3o_S" />
+      <node concept="3clFbS" id="5HVB6JS1mjQ" role="3clF47">
+        <node concept="3cpWs8" id="5HVB6JS1mjR" role="3cqZAp">
+          <node concept="3cpWsn" id="5HVB6JS1mjS" role="3cpWs9">
+            <property role="TrG5h" value="tc" />
+            <node concept="3uibUv" id="5HVB6JS1mjT" role="1tU5fm">
+              <ref role="3uigEE" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
+            </node>
+            <node concept="2YIFZM" id="5HVB6JS1mjU" role="33vP2m">
+              <ref role="37wK5l" node="4Z$O9mrQIG1" resolve="get" />
+              <ref role="1Pybhc" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
+              <node concept="37vLTw" id="5HVB6JS1mjV" role="37wK5m">
+                <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="5HVB6JS1mjW" role="3cqZAp">
+          <node concept="2OqwBi" id="5HVB6JS1mjX" role="3clFbG">
+            <node concept="37vLTw" id="5HVB6JS1mjY" role="2Oq$k0">
+              <ref role="3cqZAo" node="5HVB6JS1mjS" resolve="tc" />
+            </node>
+            <node concept="liA8E" id="5HVB6JS1mjZ" role="2OqNvi">
+              <ref role="37wK5l" node="5HVB6JS1Tc9" resolve="clearAllCaches" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5HVB6JS1mjK" role="jymVt" />
     <node concept="3clFb_" id="1FOQehxdXIx" role="jymVt">
       <property role="TrG5h" value="checkTypes" />
       <node concept="37vLTG" id="1FOQehxdZUm" role="3clF46">
@@ -7334,8 +7502,8 @@
               <ref role="3uigEE" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
             </node>
             <node concept="2YIFZM" id="7yzrjo0HeRa" role="33vP2m">
-              <ref role="37wK5l" node="4Z$O9mrQIG1" resolve="get" />
               <ref role="1Pybhc" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
+              <ref role="37wK5l" node="4Z$O9mrQIG1" resolve="get" />
               <node concept="37vLTw" id="7yzrjo0HeRb" role="37wK5m">
                 <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
               </node>
@@ -7476,8 +7644,8 @@
               <ref role="3uigEE" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
             </node>
             <node concept="2YIFZM" id="7yzrjo0QFxS" role="33vP2m">
-              <ref role="37wK5l" node="4Z$O9mrQIG1" resolve="get" />
               <ref role="1Pybhc" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
+              <ref role="37wK5l" node="4Z$O9mrQIG1" resolve="get" />
               <node concept="37vLTw" id="7yzrjo0QFxT" role="37wK5m">
                 <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
               </node>
@@ -7652,13 +7820,13 @@
         </node>
         <node concept="3cpWs8" id="61G6TdDi00C" role="3cqZAp">
           <node concept="3cpWsn" id="61G6TdDi00D" role="3cpWs9">
-            <property role="TrG5h" value="tc" />
+            <property role="TrG5h" value="state" />
             <node concept="3uibUv" id="61G6TdDi00E" role="1tU5fm">
               <ref role="3uigEE" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
             </node>
             <node concept="2YIFZM" id="61G6TdDi00F" role="33vP2m">
-              <ref role="37wK5l" node="4Z$O9mrQIG1" resolve="get" />
               <ref role="1Pybhc" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
+              <ref role="37wK5l" node="4Z$O9mrQIG1" resolve="get" />
               <node concept="37vLTw" id="61G6TdDi00G" role="37wK5m">
                 <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
               </node>
@@ -7693,7 +7861,7 @@
             </node>
             <node concept="2OqwBi" id="61G6TdDj39b" role="33vP2m">
               <node concept="37vLTw" id="61G6TdDj39c" role="2Oq$k0">
-                <ref role="3cqZAo" node="61G6TdDi00D" resolve="tc" />
+                <ref role="3cqZAo" node="61G6TdDi00D" resolve="state" />
               </node>
               <node concept="liA8E" id="61G6TdDj39d" role="2OqNvi">
                 <ref role="37wK5l" node="44XN1Jd1wRa" resolve="updateTypecheckingResults" />
@@ -10447,6 +10615,15 @@
     <node concept="3HP615" id="4Dkptq1Qcxp" role="jymVt">
       <property role="TrG5h" value="TypecheckingResultsUpdatable" />
       <node concept="2tJIrI" id="44XN1Jd0DhC" role="jymVt" />
+      <node concept="3clFb_" id="5HVB6JRpsgR" role="jymVt">
+        <property role="TrG5h" value="typecheckingState" />
+        <node concept="3uibUv" id="5HVB6JRpuel" role="3clF45">
+          <ref role="3uigEE" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
+        </node>
+        <node concept="3Tm1VV" id="5HVB6JRpsgU" role="1B3o_S" />
+        <node concept="3clFbS" id="5HVB6JRpsgV" role="3clF47" />
+      </node>
+      <node concept="2tJIrI" id="5HVB6JRpqer" role="jymVt" />
       <node concept="3clFb_" id="61G6TdD6$Xx" role="jymVt">
         <property role="TrG5h" value="cacheHolder" />
         <node concept="3uibUv" id="61G6TdD6Eph" role="3clF45">
@@ -10846,43 +11023,9 @@
       <node concept="3cqZAl" id="14$_tTxApBI" role="3clF45" />
       <node concept="3Tm6S6" id="5lxnBcU3XAg" role="1B3o_S" />
       <node concept="3clFbS" id="14$_tTxApBK" role="3clF47">
-        <node concept="3clFbF" id="61G6TdDc3aB" role="3cqZAp">
-          <node concept="1rXfSq" id="61G6TdDc3a_" role="3clFbG">
-            <ref role="37wK5l" node="61G6TdDbzkU" resolve="updateAllUnitCacheHolders" />
-            <node concept="1bVj0M" id="7Mte5SKj4mM" role="37wK5m">
-              <node concept="37vLTG" id="7Mte5SKj4S3" role="1bW2Oz">
-                <property role="TrG5h" value="key" />
-                <node concept="3uibUv" id="4vBwiiVtPSw" role="1tU5fm">
-                  <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                </node>
-              </node>
-              <node concept="37vLTG" id="7Mte5SKj5zG" role="1bW2Oz">
-                <property role="TrG5h" value="holder" />
-                <node concept="3uibUv" id="7Mte5SKj5UC" role="1tU5fm">
-                  <ref role="3uigEE" node="4Z$O9mrQJw7" resolve="UnitCacheHolder" />
-                </node>
-              </node>
-              <node concept="3clFbS" id="7Mte5SKj4mN" role="1bW5cS">
-                <node concept="3clFbF" id="7Mte5SKj6Ee" role="3cqZAp">
-                  <node concept="2OqwBi" id="7Mte5SKj6Sz" role="3clFbG">
-                    <node concept="37vLTw" id="7Mte5SKj6Ed" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7Mte5SKj5zG" resolve="holder" />
-                    </node>
-                    <node concept="liA8E" id="7Mte5SKj7mb" role="2OqNvi">
-                      <ref role="37wK5l" node="3u5wJtfjHf" resolve="clearAll" />
-                      <node concept="37vLTw" id="7Mte5SKj8yn" role="37wK5m">
-                        <ref role="3cqZAo" node="4Z$O9mrQIM1" resolve="repository" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="61G6TdDcEcV" role="3cqZAp">
-          <node concept="1rXfSq" id="61G6TdDcEcT" role="3clFbG">
-            <ref role="37wK5l" node="61G6TdDcewU" resolve="clearAllUnitCacheHolders" />
+        <node concept="3clFbF" id="5HVB6JS2h$y" role="3cqZAp">
+          <node concept="1rXfSq" id="5HVB6JS2h$w" role="3clFbG">
+            <ref role="37wK5l" node="5HVB6JS1Tc9" resolve="clearAllCaches" />
           </node>
         </node>
         <node concept="3SKdUt" id="2cnGCY$roUo" role="3cqZAp">
@@ -11343,6 +11486,63 @@
       </node>
     </node>
     <node concept="2tJIrI" id="44XN1Jd1q5j" role="jymVt" />
+    <node concept="3clFb_" id="5HVB6JS1Tc9" role="jymVt">
+      <property role="TrG5h" value="clearAllCaches" />
+      <node concept="3cqZAl" id="5HVB6JS1Tcb" role="3clF45" />
+      <node concept="3Tmbuc" id="5HVB6JS2dP1" role="1B3o_S" />
+      <node concept="3clFbS" id="5HVB6JS1Tcd" role="3clF47">
+        <node concept="3clFbF" id="61G6TdDc3aB" role="3cqZAp">
+          <node concept="1rXfSq" id="61G6TdDc3a_" role="3clFbG">
+            <ref role="37wK5l" node="61G6TdDbzkU" />
+            <node concept="1bVj0M" id="7Mte5SKj4mM" role="37wK5m">
+              <node concept="37vLTG" id="7Mte5SKj4S3" role="1bW2Oz">
+                <property role="TrG5h" value="key" />
+                <node concept="3uibUv" id="4vBwiiVtPSw" role="1tU5fm">
+                  <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+                </node>
+              </node>
+              <node concept="37vLTG" id="7Mte5SKj5zG" role="1bW2Oz">
+                <property role="TrG5h" value="holder" />
+                <node concept="3uibUv" id="7Mte5SKj5UC" role="1tU5fm">
+                  <ref role="3uigEE" node="4Z$O9mrQJw7" />
+                </node>
+              </node>
+              <node concept="3clFbS" id="7Mte5SKj4mN" role="1bW5cS">
+                <node concept="3clFbF" id="7Mte5SKj6Ee" role="3cqZAp">
+                  <node concept="2OqwBi" id="7Mte5SKj6Sz" role="3clFbG">
+                    <node concept="37vLTw" id="7Mte5SKj6Ed" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7Mte5SKj5zG" />
+                    </node>
+                    <node concept="liA8E" id="7Mte5SKj7mb" role="2OqNvi">
+                      <ref role="37wK5l" node="3u5wJtfjHf" />
+                      <node concept="37vLTw" id="7Mte5SKj8yn" role="37wK5m">
+                        <ref role="3cqZAo" node="4Z$O9mrQIM1" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="61G6TdDcEcV" role="3cqZAp">
+          <node concept="1rXfSq" id="61G6TdDcEcT" role="3clFbG">
+            <ref role="37wK5l" node="61G6TdDcewU" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="5HVB6JS2k7u" role="3cqZAp">
+          <node concept="2OqwBi" id="5HVB6JS2kmf" role="3clFbG">
+            <node concept="37vLTw" id="5HVB6JS2k7s" role="2Oq$k0">
+              <ref role="3cqZAo" node="7yzrjo17ONc" resolve="repositoryCacheHolder" />
+            </node>
+            <node concept="liA8E" id="5HVB6JS2ns_" role="2OqNvi">
+              <ref role="37wK5l" node="740EMdM1mi$" resolve="clearCache" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5HVB6JS1KdB" role="jymVt" />
     <node concept="3clFb_" id="4duYm8_mMNK" role="jymVt">
       <property role="TrG5h" value="clearAllCaches" />
       <node concept="37vLTG" id="4duYm8_mV8n" role="3clF46">
@@ -11576,6 +11776,21 @@
       <node concept="3Tmbuc" id="61G6TdC0gN5" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="7yzrjo0HreI" role="jymVt" />
+    <node concept="3clFb_" id="5HVB6JRqREG" role="jymVt">
+      <property role="TrG5h" value="repositoryCacheHolder" />
+      <node concept="3uibUv" id="5HVB6JRqU1r" role="3clF45">
+        <ref role="3uigEE" node="740EMdM0Ozw" resolve="RepositoryCacheHolder" />
+      </node>
+      <node concept="3Tmbuc" id="5HVB6JRqW4I" role="1B3o_S" />
+      <node concept="3clFbS" id="5HVB6JRqREK" role="3clF47">
+        <node concept="3clFbF" id="5HVB6JRqZO$" role="3cqZAp">
+          <node concept="37vLTw" id="5HVB6JRqZOz" role="3clFbG">
+            <ref role="3cqZAo" node="7yzrjo17ONc" resolve="repositoryCacheHolder" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5HVB6JRqPto" role="jymVt" />
     <node concept="3clFb_" id="61G6TdDl9fp" role="jymVt">
       <property role="TrG5h" value="updateTypecheckingResults" />
       <node concept="37vLTG" id="61G6TdDlDMs" role="3clF46">
@@ -11617,6 +11832,24 @@
                     <ref role="1Y3XeK" node="4Dkptq1Qcxp" resolve="TypecheckingState.TypecheckingResultsUpdatable" />
                     <node concept="3Tm1VV" id="61G6TdDlW3Q" role="1B3o_S" />
                     <node concept="2tJIrI" id="61G6TdDlW3R" role="jymVt" />
+                    <node concept="3clFb_" id="5HVB6JRpUF4" role="jymVt">
+                      <property role="TrG5h" value="typecheckingState" />
+                      <node concept="3uibUv" id="5HVB6JRpUF5" role="3clF45">
+                        <ref role="3uigEE" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
+                      </node>
+                      <node concept="3Tm1VV" id="5HVB6JRpUF6" role="1B3o_S" />
+                      <node concept="3clFbS" id="5HVB6JRpUF9" role="3clF47">
+                        <node concept="3clFbF" id="5HVB6JRpW55" role="3cqZAp">
+                          <node concept="Xjq3P" id="5HVB6JRpW52" role="3clFbG">
+                            <ref role="1HBi2w" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2AHcQZ" id="5HVB6JRpUFa" role="2AJF6D">
+                        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                      </node>
+                    </node>
+                    <node concept="2tJIrI" id="5HVB6JRpWr7" role="jymVt" />
                     <node concept="3clFb_" id="61G6TdDlW3S" role="jymVt">
                       <property role="TrG5h" value="cacheHolder" />
                       <node concept="3uibUv" id="61G6TdDlW3T" role="3clF45">
@@ -12185,6 +12418,7 @@
     <node concept="3clFb_" id="61G6TdDcewU" role="jymVt">
       <property role="TrG5h" value="clearAllUnitCacheHolders" />
       <node concept="3cqZAl" id="61G6TdDcewW" role="3clF45" />
+      <node concept="3Tm6S6" id="6b6o3l3kk3s" role="1B3o_S" />
       <node concept="3clFbS" id="61G6TdDcewY" role="3clF47">
         <node concept="3clFbF" id="61G6TdDcySH" role="3cqZAp">
           <node concept="2OqwBi" id="61G6TdDczoO" role="3clFbG">
@@ -12207,7 +12441,6 @@
           </node>
         </node>
       </node>
-      <node concept="3Tm6S6" id="6b6o3l3kk3s" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="61G6TdDc$Yx" role="jymVt" />
     <node concept="312cEg" id="4Z$O9mrQIM1" role="jymVt">
@@ -12355,6 +12588,9 @@
             </node>
             <node concept="3clFbF" id="2ceN1hCNy9M" role="3cqZAp">
               <node concept="2OqwBi" id="2ceN1hCNyof" role="3clFbG">
+                <node concept="37vLTw" id="6b6o3l3hniX" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6b6o3l3hiL$" resolve="newCache" />
+                </node>
                 <node concept="liA8E" id="2ceN1hCNGNU" role="2OqNvi">
                   <ref role="37wK5l" node="2ceN1hCN$q1" resolve="merge" />
                   <node concept="37vLTw" id="3yEb0I3WkL7" role="37wK5m">
@@ -12373,9 +12609,6 @@
                     <ref role="3cqZAo" node="2yEnwshbvVn" resolve="invalidatedFeedbackKeys" />
                   </node>
                 </node>
-                <node concept="37vLTw" id="6b6o3l3hniX" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6b6o3l3hiL$" resolve="newCache" />
-                </node>
               </node>
             </node>
             <node concept="3clFbF" id="68BWwmZeozY" role="3cqZAp">
@@ -12392,15 +12625,15 @@
         </node>
         <node concept="3clFbF" id="2ceN1hCNIz8" role="3cqZAp">
           <node concept="37vLTI" id="2ceN1hCNIz9" role="3clFbG">
+            <node concept="37vLTw" id="6b6o3l3hntl" role="37vLTx">
+              <ref role="3cqZAo" node="6b6o3l3hiL$" resolve="newCache" />
+            </node>
             <node concept="2OqwBi" id="2ceN1hCNIzb" role="37vLTJ">
               <node concept="Xjq3P" id="2ceN1hCNIzc" role="2Oq$k0" />
               <node concept="2OwXpG" id="2ceN1hCNIzd" role="2OqNvi">
                 <ref role="2Oxat5" node="4Z$O9mrQJ$h" resolve="index" />
               </node>
             </node>
-            <node concept="37vLTw" id="6b6o3l3hntl" role="37vLTx">
-              <ref role="3cqZAo" node="6b6o3l3hiL$" resolve="newCache" />
-            </node>
           </node>
         </node>
         <node concept="3cpWs6" id="QpMEos8zP1" role="3cqZAp">
@@ -12446,6 +12679,12 @@
           <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
         </node>
       </node>
+      <node concept="37vLTG" id="6b6o3l3huA6" role="3clF46">
+        <property role="TrG5h" value="newCache" />
+        <node concept="3uibUv" id="6b6o3l3huRk" role="1tU5fm">
+          <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
+        </node>
+      </node>
       <node concept="3uibUv" id="5Qx6_65_i3t" role="3clF45">
         <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
       </node>
@@ -12471,6 +12710,9 @@
             </node>
             <node concept="3clFbF" id="61G6TdDvszX" role="3cqZAp">
               <node concept="2OqwBi" id="61G6TdDvszY" role="3clFbG">
+                <node concept="37vLTw" id="6b6o3l3hxRD" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6b6o3l3huA6" resolve="newCache" />
+                </node>
                 <node concept="liA8E" id="61G6TdDvs$0" role="2OqNvi">
                   <ref role="37wK5l" node="61G6TdDuZzD" resolve="merge" />
                   <node concept="37vLTw" id="61G6TdDvs$1" role="37wK5m">
@@ -12483,9 +12725,6 @@
                     </node>
                   </node>
                 </node>
-                <node concept="37vLTw" id="6b6o3l3hxRD" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6b6o3l3huA6" resolve="newCache" />
-                </node>
               </node>
             </node>
             <node concept="3clFbF" id="5Qx6_65_i3R" role="3cqZAp">
@@ -12502,15 +12741,15 @@
         </node>
         <node concept="3clFbF" id="5Qx6_65_i3V" role="3cqZAp">
           <node concept="37vLTI" id="5Qx6_65_i3W" role="3clFbG">
+            <node concept="37vLTw" id="6b6o3l3hy1N" role="37vLTx">
+              <ref role="3cqZAo" node="6b6o3l3huA6" resolve="newCache" />
+            </node>
             <node concept="2OqwBi" id="5Qx6_65_i3Y" role="37vLTJ">
               <node concept="Xjq3P" id="5Qx6_65_i3Z" role="2Oq$k0" />
               <node concept="2OwXpG" id="5Qx6_65_i40" role="2OqNvi">
                 <ref role="2Oxat5" node="4Z$O9mrQJ$h" resolve="index" />
               </node>
             </node>
-            <node concept="37vLTw" id="6b6o3l3hy1N" role="37vLTx">
-              <ref role="3cqZAo" node="6b6o3l3huA6" resolve="newCache" />
-            </node>
           </node>
         </node>
         <node concept="3cpWs6" id="5Qx6_65_i4t" role="3cqZAp">
@@ -12519,12 +12758,6 @@
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="6b6o3l3huA6" role="3clF46">
-        <property role="TrG5h" value="newCache" />
-        <node concept="3uibUv" id="6b6o3l3huRk" role="1tU5fm">
-          <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-        </node>
-      </node>
     </node>
     <node concept="2tJIrI" id="5Qx6_65_i3j" role="jymVt" />
     <node concept="3clFb_" id="3u5wJtfjHf" role="jymVt">
@@ -12682,7 +12915,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="3Q0j2bxwOHx" role="jymVt" />
-    <node concept="2tJIrI" id="51a$_pPOdZD" role="jymVt" />
     <node concept="3clFb_" id="5MNibENd8aG" role="jymVt">
       <property role="TrG5h" value="setUserObject" />
       <node concept="37vLTG" id="5MNibENd9Ui" role="3clF46">
@@ -12910,6 +13142,12 @@
     <node concept="2tJIrI" id="740EMdM1e$s" role="jymVt" />
     <node concept="3clFb_" id="740EMdM1fUq" role="jymVt">
       <property role="TrG5h" value="updateQueriesCache" />
+      <node concept="37vLTG" id="6b6o3l3h5xZ" role="3clF46">
+        <property role="TrG5h" value="newCache" />
+        <node concept="3uibUv" id="6b6o3l3h5Qk" role="1tU5fm">
+          <ref role="3uigEE" node="740EMdM1eNm" resolve="QueryResultsCache" />
+        </node>
+      </node>
       <node concept="3uibUv" id="740EMdM1gbN" role="3clF45">
         <ref role="3uigEE" node="740EMdM1eNm" resolve="QueryResultsCache" />
       </node>
@@ -12918,15 +13156,15 @@
           <node concept="3clFbS" id="740EMdM1kZI" role="3clFbx">
             <node concept="3clFbF" id="740EMdM1lQV" role="3cqZAp">
               <node concept="2OqwBi" id="740EMdM1m1h" role="3clFbG">
+                <node concept="37vLTw" id="6b6o3l3h9w5" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6b6o3l3h5xZ" resolve="newCache" />
+                </node>
                 <node concept="liA8E" id="740EMdM1m74" role="2OqNvi">
                   <ref role="37wK5l" node="740EMdM1jlq" resolve="merge" />
                   <node concept="37vLTw" id="740EMdM1mbE" role="37wK5m">
                     <ref role="3cqZAo" node="740EMdM1ktI" resolve="cache" />
                   </node>
                 </node>
-                <node concept="37vLTw" id="6b6o3l3h9w5" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6b6o3l3h5xZ" resolve="newCache" />
-                </node>
               </node>
             </node>
           </node>
@@ -12968,27 +13206,8 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="740EMdM1g5h" role="1B3o_S" />
-      <node concept="37vLTG" id="6b6o3l3h5xZ" role="3clF46">
-        <property role="TrG5h" value="newCache" />
-        <node concept="3uibUv" id="6b6o3l3h5Qk" role="1tU5fm">
-          <ref role="3uigEE" node="740EMdM1eNm" resolve="QueryResultsCache" />
-        </node>
-      </node>
     </node>
     <node concept="2tJIrI" id="740EMdM1yRX" role="jymVt" />
-    <node concept="3clFb_" id="740EMdM1ekB" role="jymVt">
-      <property role="TrG5h" value="clear" />
-      <node concept="3cqZAl" id="740EMdM1ekD" role="3clF45" />
-      <node concept="3clFbS" id="740EMdM1ekE" role="3clF47">
-        <node concept="3clFbF" id="740EMdM1w$A" role="3cqZAp">
-          <node concept="1rXfSq" id="740EMdM1wD7" role="3clFbG">
-            <ref role="37wK5l" node="740EMdM1mi$" resolve="clearCache" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="740EMdM1erk" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="740EMdM1e9P" role="jymVt" />
     <node concept="3clFb_" id="740EMdM1mi$" role="jymVt">
       <property role="TrG5h" value="clearCache" />
       <node concept="3cqZAl" id="740EMdM1mi_" role="3clF45" />
@@ -13024,10 +13243,35 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="5HVB6JRp9Oz" role="3cqZAp">
+          <node concept="2OqwBi" id="5HVB6JRp9Xo" role="3clFbG">
+            <node concept="37vLTw" id="5HVB6JRp9Ox" role="2Oq$k0">
+              <ref role="3cqZAo" node="5HVB6JRp8VU" resolve="sessionData" />
+            </node>
+            <node concept="liA8E" id="5HVB6JRpa5r" role="2OqNvi">
+              <ref role="37wK5l" node="7i3KM7g2fvr" resolve="clearAll" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="3Tm1VV" id="740EMdM1miB" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="740EMdM1miz" role="jymVt" />
+    <node concept="3clFb_" id="5HVB6JRr9qu" role="jymVt">
+      <property role="TrG5h" value="getSessionData" />
+      <node concept="3uibUv" id="5HVB6JRra6m" role="3clF45">
+        <ref role="3uigEE" node="7i3KM7g1Hnp" resolve="SessionData" />
+      </node>
+      <node concept="3clFbS" id="5HVB6JRr9qx" role="3clF47">
+        <node concept="3clFbF" id="5HVB6JRraJz" role="3cqZAp">
+          <node concept="37vLTw" id="5HVB6JRraJy" role="3clFbG">
+            <ref role="3cqZAo" node="5HVB6JRp8VU" resolve="sessionData" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5HVB6JRr9Xa" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="5HVB6JRr988" role="jymVt" />
     <node concept="3clFb_" id="740EMdM0Z97" role="jymVt">
       <property role="TrG5h" value="invalidate" />
       <node concept="3cqZAl" id="740EMdM0Z99" role="3clF45" />
@@ -13211,6 +13455,18 @@
         <ref role="3uigEE" node="740EMdM1eNm" resolve="QueryResultsCache" />
       </node>
     </node>
+    <node concept="312cEg" id="5HVB6JRp8VU" role="jymVt">
+      <property role="TrG5h" value="sessionData" />
+      <node concept="3Tm6S6" id="5HVB6JRp8VV" role="1B3o_S" />
+      <node concept="3uibUv" id="5HVB6JRp98u" role="1tU5fm">
+        <ref role="3uigEE" node="7i3KM7g1Hnp" resolve="SessionData" />
+      </node>
+      <node concept="2ShNRf" id="5HVB6JRp9hB" role="33vP2m">
+        <node concept="HV5vD" id="5HVB6JRp9F2" role="2ShVmc">
+          <ref role="HV5vE" node="7i3KM7g1Hnp" resolve="SessionData" />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="740EMdM1eNm">
     <property role="3GE5qa" value="cache" />
@@ -13964,7 +14220,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="740EMdM1eOD" role="jymVt" />
-    <node concept="3Tm1VV" id="740EMdM1eNn" role="1B3o_S" />
     <node concept="312cEg" id="7yzrjo0RKgN" role="jymVt">
       <property role="TrG5h" value="convertsToCache" />
       <node concept="3Tm6S6" id="7yzrjo0RKgO" role="1B3o_S" />
@@ -14042,6 +14297,7 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7yzrjo0RE8O" role="jymVt" />
+    <node concept="3Tm1VV" id="740EMdM1eNn" role="1B3o_S" />
     <node concept="3UR2Jj" id="6b6o3l3gL14" role="lGtFl">
       <node concept="TZ5HA" id="6b6o3l3gL15" role="TZ5H$">
         <node concept="1dT_AC" id="6b6o3l3gL16" role="1dT_Ay">
@@ -16203,6 +16459,12 @@
           <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
         </node>
       </node>
+      <node concept="37vLTG" id="6b6o3l3hpJf" role="3clF46">
+        <property role="TrG5h" value="newCahe" />
+        <node concept="3uibUv" id="6b6o3l3hq_R" role="1tU5fm">
+          <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
+        </node>
+      </node>
       <node concept="3uibUv" id="61G6TdBXXtS" role="3clF45">
         <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
       </node>
@@ -16309,12 +16571,6 @@
       <node concept="2AHcQZ" id="61G6TdBXXuO" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="37vLTG" id="6b6o3l3hpJf" role="3clF46">
-        <property role="TrG5h" value="newCahe" />
-        <node concept="3uibUv" id="6b6o3l3hq_R" role="1tU5fm">
-          <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-        </node>
-      </node>
     </node>
     <node concept="2tJIrI" id="61G6TdBYVh0" role="jymVt" />
     <node concept="3clFb_" id="61G6TdBYWb2" role="jymVt">
@@ -16974,6 +17230,237 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="5HVB6JRkJT0" role="jymVt" />
+    <node concept="312cEu" id="5HVB6JRkwKp" role="jymVt">
+      <property role="TrG5h" value="MemoImpl" />
+      <node concept="2tJIrI" id="5HVB6JRK4ym" role="jymVt" />
+      <node concept="Wx3nA" id="5HVB6JRK86G" role="jymVt">
+        <property role="TrG5h" value="RECURSION_GUARD" />
+        <node concept="3uibUv" id="5HVB6JRK5rd" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+        <node concept="3Tm6S6" id="5HVB6JRK4Vb" role="1B3o_S" />
+        <node concept="2ShNRf" id="5HVB6JRKb2K" role="33vP2m">
+          <node concept="1pGfFk" id="5HVB6JRKbtW" role="2ShVmc">
+            <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="5HVB6JRKdQN" role="jymVt" />
+      <node concept="3Tm1VV" id="5HVB6JRkwKq" role="1B3o_S" />
+      <node concept="3uibUv" id="5HVB6JRkPve" role="EKbjA">
+        <ref role="3uigEE" to="i348:6PWFJfG5LMK" resolve="Memo" />
+      </node>
+      <node concept="3clFb_" id="5HVB6JRkPLX" role="jymVt">
+        <property role="TrG5h" value="getOrSetValue" />
+        <node concept="37vLTG" id="5HVB6JRkPLY" role="3clF46">
+          <property role="TrG5h" value="key" />
+          <node concept="3uibUv" id="5HVB6JRkPLZ" role="1tU5fm">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="5HVB6JRkPM0" role="3clF46">
+          <property role="TrG5h" value="defaultValue" />
+          <node concept="3uibUv" id="5HVB6JRkPM1" role="1tU5fm">
+            <ref role="3uigEE" to="18ew:~Computable" resolve="Computable" />
+            <node concept="16syzq" id="5HVB6JRkPM2" role="11_B2D">
+              <ref role="16sUi3" node="5HVB6JRkPM6" resolve="T" />
+            </node>
+          </node>
+        </node>
+        <node concept="16syzq" id="5HVB6JRkPM3" role="3clF45">
+          <ref role="16sUi3" node="5HVB6JRkPM6" resolve="T" />
+        </node>
+        <node concept="3Tm1VV" id="5HVB6JRkPM4" role="1B3o_S" />
+        <node concept="16euLQ" id="5HVB6JRkPM6" role="16eVyc">
+          <property role="TrG5h" value="T" />
+        </node>
+        <node concept="3clFbS" id="5HVB6JRkPM7" role="3clF47">
+          <node concept="3clFbJ" id="5HVB6JRKeCI" role="3cqZAp">
+            <node concept="3clFbS" id="5HVB6JRKeCK" role="3clFbx">
+              <node concept="3cpWs8" id="5HVB6JRKp9K" role="3cqZAp">
+                <node concept="3cpWsn" id="5HVB6JRKp9L" role="3cpWs9">
+                  <property role="TrG5h" value="value" />
+                  <node concept="3uibUv" id="5HVB6JRKoMr" role="1tU5fm">
+                    <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                  </node>
+                  <node concept="2OqwBi" id="5HVB6JRKp9M" role="33vP2m">
+                    <node concept="37vLTw" id="5HVB6JRKp9N" role="2Oq$k0">
+                      <ref role="3cqZAo" node="5HVB6JRkS7A" resolve="values" />
+                    </node>
+                    <node concept="liA8E" id="5HVB6JRKp9O" role="2OqNvi">
+                      <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
+                      <node concept="37vLTw" id="5HVB6JRKp9P" role="37wK5m">
+                        <ref role="3cqZAo" node="5HVB6JRkPLY" resolve="key" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbJ" id="5HVB6JRKt6t" role="3cqZAp">
+                <node concept="3clFbS" id="5HVB6JRKt6v" role="3clFbx">
+                  <node concept="YS8fn" id="5HVB6JRI87U" role="3cqZAp">
+                    <node concept="2ShNRf" id="5HVB6JRI8Cr" role="YScLw">
+                      <node concept="1pGfFk" id="5HVB6JRI9s9" role="2ShVmc">
+                        <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
+                        <node concept="Xl_RD" id="5HVB6JRKutc" role="37wK5m">
+                          <property role="Xl_RC" value="prohibited recursion" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="5HVB6JRKt6u" role="3cqZAp" />
+                </node>
+                <node concept="3clFbC" id="5HVB6JRKtxc" role="3clFbw">
+                  <node concept="37vLTw" id="5HVB6JRKtGl" role="3uHU7w">
+                    <ref role="3cqZAo" node="5HVB6JRK86G" resolve="RECURSION_GUARD" />
+                  </node>
+                  <node concept="37vLTw" id="5HVB6JRKtsT" role="3uHU7B">
+                    <ref role="3cqZAo" node="5HVB6JRKp9L" resolve="value" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs6" id="5HVB6JRKvcM" role="3cqZAp">
+                <node concept="10QFUN" id="5HVB6JRKwJg" role="3cqZAk">
+                  <node concept="37vLTw" id="5HVB6JRKwJf" role="10QFUP">
+                    <ref role="3cqZAo" node="5HVB6JRKp9L" resolve="value" />
+                  </node>
+                  <node concept="16syzq" id="5HVB6JRKwJe" role="10QFUM">
+                    <ref role="16sUi3" node="5HVB6JRkPM6" resolve="T" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="5HVB6JRKfAy" role="3clFbw">
+              <node concept="37vLTw" id="5HVB6JRKf3u" role="2Oq$k0">
+                <ref role="3cqZAo" node="5HVB6JRkS7A" resolve="values" />
+              </node>
+              <node concept="liA8E" id="5HVB6JRKgvW" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~Map.containsKey(java.lang.Object)" resolve="containsKey" />
+                <node concept="37vLTw" id="5HVB6JRKhDt" role="37wK5m">
+                  <ref role="3cqZAo" node="5HVB6JRkPLY" resolve="key" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="5HVB6JRKBDC" role="3cqZAp">
+            <node concept="3cpWsn" id="5HVB6JRKBDD" role="3cpWs9">
+              <property role="TrG5h" value="computed" />
+              <node concept="16syzq" id="5HVB6JRKBiO" role="1tU5fm">
+                <ref role="16sUi3" node="5HVB6JRkPM6" resolve="T" />
+              </node>
+              <node concept="10Nm6u" id="5HVB6JRKE5U" role="33vP2m" />
+            </node>
+          </node>
+          <node concept="3J1_TO" id="5HVB6JRIaNs" role="3cqZAp">
+            <node concept="3clFbS" id="5HVB6JRIaNu" role="1zxBo7">
+              <node concept="3clFbF" id="5HVB6JRKydv" role="3cqZAp">
+                <node concept="2OqwBi" id="5HVB6JRKyLp" role="3clFbG">
+                  <node concept="37vLTw" id="5HVB6JRKydt" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5HVB6JRkS7A" resolve="values" />
+                  </node>
+                  <node concept="liA8E" id="5HVB6JRKzDg" role="2OqNvi">
+                    <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object)" resolve="put" />
+                    <node concept="37vLTw" id="5HVB6JRK$Tv" role="37wK5m">
+                      <ref role="3cqZAo" node="5HVB6JRkPLY" resolve="key" />
+                    </node>
+                    <node concept="37vLTw" id="5HVB6JRK_EQ" role="37wK5m">
+                      <ref role="3cqZAo" node="5HVB6JRK86G" resolve="RECURSION_GUARD" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="5HVB6JRKCTf" role="3cqZAp">
+                <node concept="37vLTI" id="5HVB6JRKCTh" role="3clFbG">
+                  <node concept="2OqwBi" id="5HVB6JRKBDE" role="37vLTx">
+                    <node concept="37vLTw" id="5HVB6JRKBDF" role="2Oq$k0">
+                      <ref role="3cqZAo" node="5HVB6JRkPM0" resolve="defaultValue" />
+                    </node>
+                    <node concept="liA8E" id="5HVB6JRKBDG" role="2OqNvi">
+                      <ref role="37wK5l" to="18ew:~Computable.compute()" resolve="compute" />
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="5HVB6JRKCTl" role="37vLTJ">
+                    <ref role="3cqZAo" node="5HVB6JRKBDD" resolve="computed" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="5HVB6JRIaNt" role="3cqZAp" />
+            </node>
+            <node concept="1wplmZ" id="5HVB6JRIb6c" role="1zxBo6">
+              <node concept="3clFbS" id="5HVB6JRIb6d" role="1wplMD">
+                <node concept="3clFbJ" id="5HVB6JRKX9g" role="3cqZAp">
+                  <node concept="3clFbS" id="5HVB6JRKXa3" role="3clFbx">
+                    <node concept="YS8fn" id="5HVB6JRKZKl" role="3cqZAp">
+                      <node concept="2ShNRf" id="5HVB6JRKZLf" role="YScLw">
+                        <node concept="1pGfFk" id="5HVB6JRL0$R" role="2ShVmc">
+                          <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
+                          <node concept="Xl_RD" id="5HVB6JRL0FM" role="37wK5m">
+                            <property role="Xl_RC" value="internal error" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3fqX7Q" id="5HVB6JRKYtf" role="3clFbw">
+                    <node concept="2OqwBi" id="5HVB6JRKYth" role="3fr31v">
+                      <node concept="37vLTw" id="5HVB6JRKYti" role="2Oq$k0">
+                        <ref role="3cqZAo" node="5HVB6JRkS7A" resolve="values" />
+                      </node>
+                      <node concept="liA8E" id="5HVB6JRKYtj" role="2OqNvi">
+                        <ref role="37wK5l" to="33ny:~Map.replace(java.lang.Object,java.lang.Object,java.lang.Object)" resolve="replace" />
+                        <node concept="37vLTw" id="5HVB6JRKYtk" role="37wK5m">
+                          <ref role="3cqZAo" node="5HVB6JRkPLY" resolve="key" />
+                        </node>
+                        <node concept="37vLTw" id="5HVB6JRKYtl" role="37wK5m">
+                          <ref role="3cqZAo" node="5HVB6JRK86G" resolve="RECURSION_GUARD" />
+                        </node>
+                        <node concept="37vLTw" id="5HVB6JRKYtm" role="37wK5m">
+                          <ref role="3cqZAo" node="5HVB6JRKBDD" resolve="computed" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="5HVB6JRKB6p" role="3cqZAp">
+            <node concept="37vLTw" id="5HVB6JRKBDH" role="3clFbG">
+              <ref role="3cqZAo" node="5HVB6JRKBDD" resolve="computed" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="5HVB6JRkPM8" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="5HVB6JRkS2$" role="jymVt" />
+      <node concept="312cEg" id="5HVB6JRkS7A" role="jymVt">
+        <property role="TrG5h" value="values" />
+        <node concept="3Tm6S6" id="5HVB6JRkS7B" role="1B3o_S" />
+        <node concept="3uibUv" id="5HVB6JRkY3_" role="1tU5fm">
+          <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+          <node concept="3uibUv" id="5HVB6JRl02s" role="11_B2D">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+          <node concept="3uibUv" id="5HVB6JRl1XY" role="11_B2D">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+        </node>
+        <node concept="2ShNRf" id="5HVB6JRkW17" role="33vP2m">
+          <node concept="1pGfFk" id="5HVB6JRl5yQ" role="2ShVmc">
+            <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
+            <node concept="3uibUv" id="5HVB6JRl6Ph" role="1pMfVU">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+            <node concept="3uibUv" id="5HVB6JRl7DE" role="1pMfVU">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="3KN3A4vEXnh" role="jymVt" />
     <node concept="312cEu" id="7i3KM7gIg9K" role="jymVt">
       <property role="TrG5h" value="Default" />
@@ -17105,6 +17592,9 @@
                 </node>
                 <node concept="1rXfSq" id="61G6TdBAxrX" role="37wK5m">
                   <ref role="37wK5l" node="61G6TdB_yxW" resolve="createMacroProcessing" />
+                  <node concept="37vLTw" id="6PWFJfG8SCT" role="37wK5m">
+                    <ref role="3cqZAo" node="7i3KM7gIUOR" resolve="aspectClique" />
+                  </node>
                   <node concept="37vLTw" id="61G6TdBAxrY" role="37wK5m">
                     <ref role="3cqZAo" node="6nFpYlun4Ef" resolve="session" />
                   </node>
@@ -17144,6 +17634,13 @@
         <node concept="3uibUv" id="61G6TdBA092" role="3clF45">
           <ref role="3uigEE" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
         </node>
+        <node concept="37vLTG" id="6PWFJfG8SUx" role="3clF46">
+          <property role="TrG5h" value="aspectClique" />
+          <node concept="3uibUv" id="6PWFJfG8YmM" role="1tU5fm">
+            <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+            <node concept="3qTvmN" id="6PWFJfG908o" role="11_B2D" />
+          </node>
+        </node>
         <node concept="37vLTG" id="61G6TdB_yxS" role="3clF46">
           <property role="TrG5h" value="session" />
           <node concept="3uibUv" id="61G6TdB_yxT" role="1tU5fm">
@@ -17366,6 +17863,7 @@
                         </node>
                       </node>
                     </node>
+                    <node concept="3clFbH" id="5HVB6JRkgeO" role="3cqZAp" />
                   </node>
                   <node concept="37vLTG" id="5iJsa3_iFsu" role="1bW2Oz">
                     <property role="TrG5h" value="reportItems" />
@@ -17404,6 +17902,7 @@
                         </node>
                       </node>
                     </node>
+                    <node concept="3clFbH" id="5HVB6JRkgOR" role="3cqZAp" />
                   </node>
                   <node concept="37vLTG" id="5iJsa3_j03c" role="1bW2Oz">
                     <property role="TrG5h" value="reportItems" />
@@ -17446,6 +17945,7 @@
                         </node>
                       </node>
                     </node>
+                    <node concept="3clFbH" id="5HVB6JRkh9Q" role="3cqZAp" />
                   </node>
                   <node concept="37vLTG" id="5iJsa3_j6he" role="1bW2Oz">
                     <property role="TrG5h" value="traceEvents" />
@@ -17607,6 +18107,7 @@
       </node>
     </node>
     <node concept="2tJIrI" id="61G6TdCquVw" role="jymVt" />
+    <node concept="2tJIrI" id="5HVB6JRksiY" role="jymVt" />
     <node concept="312cEu" id="5Qx6_65Eucp" role="jymVt">
       <property role="TrG5h" value="Caching" />
       <node concept="2tJIrI" id="5Qx6_65EPgb" role="jymVt" />
@@ -17667,6 +18168,86 @@
         </node>
       </node>
       <node concept="2tJIrI" id="5Qx6_65F6XK" role="jymVt" />
+      <node concept="3clFb_" id="6PWFJfG8yyv" role="jymVt">
+        <property role="TrG5h" value="createMacroProcessing" />
+        <node concept="3Tmbuc" id="6PWFJfG8yyw" role="1B3o_S" />
+        <node concept="3uibUv" id="6PWFJfG8yyx" role="3clF45">
+          <ref role="3uigEE" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
+        </node>
+        <node concept="37vLTG" id="6PWFJfG90Zx" role="3clF46">
+          <property role="TrG5h" value="aspectClique" />
+          <node concept="3uibUv" id="6PWFJfG90Zy" role="1tU5fm">
+            <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+            <node concept="3qTvmN" id="6PWFJfG90Zz" role="11_B2D" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="6PWFJfG8yyy" role="3clF46">
+          <property role="TrG5h" value="session" />
+          <node concept="3uibUv" id="6PWFJfG8yyz" role="1tU5fm">
+            <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="6PWFJfG8yzl" role="3clF47">
+          <node concept="3clFbF" id="6PWFJfG8yzp" role="3cqZAp">
+            <node concept="2OqwBi" id="6PWFJfG8HIz" role="3clFbG">
+              <node concept="3nyPlj" id="6PWFJfG8yzo" role="2Oq$k0">
+                <ref role="37wK5l" node="61G6TdB_yxW" resolve="createMacroProcessing" />
+                <node concept="37vLTw" id="6PWFJfG9eiA" role="37wK5m">
+                  <ref role="3cqZAo" node="6PWFJfG90Zx" resolve="aspectClique" />
+                </node>
+                <node concept="37vLTw" id="6PWFJfG8yzn" role="37wK5m">
+                  <ref role="3cqZAo" node="6PWFJfG8yyy" resolve="session" />
+                </node>
+              </node>
+              <node concept="liA8E" id="6PWFJfG8HTO" role="2OqNvi">
+                <ref role="37wK5l" to="ksgm:6PWFJfG6VOq" resolve="withMemo" />
+                <node concept="2OqwBi" id="6PWFJfG9ave" role="37wK5m">
+                  <node concept="2OqwBi" id="6PWFJfG8Js9" role="2Oq$k0">
+                    <node concept="2OqwBi" id="5HVB6JRqN8O" role="2Oq$k0">
+                      <node concept="2OqwBi" id="6PWFJfG8IHa" role="2Oq$k0">
+                        <node concept="37vLTw" id="6PWFJfG8I_z" role="2Oq$k0">
+                          <ref role="3cqZAo" node="5Qx6_65tZCJ" resolve="updatable" />
+                        </node>
+                        <node concept="liA8E" id="5HVB6JRqMP5" role="2OqNvi">
+                          <ref role="37wK5l" node="5HVB6JRpsgR" resolve="typecheckingState" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="5HVB6JRr8Xs" role="2OqNvi">
+                        <ref role="37wK5l" node="5HVB6JRqREG" resolve="repositoryCacheHolder" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="6PWFJfG8K44" role="2OqNvi">
+                      <ref role="37wK5l" node="5HVB6JRr9qu" resolve="getSessionData" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="6PWFJfG9bjC" role="2OqNvi">
+                    <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSetData" />
+                    <node concept="10M0yZ" id="6PWFJfG9dsr" role="37wK5m">
+                      <ref role="3cqZAo" node="6PWFJfG61KF" resolve="MEMO" />
+                      <ref role="1PxDUh" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+                    </node>
+                    <node concept="1bVj0M" id="5HVB6JRkk4B" role="37wK5m">
+                      <node concept="3clFbS" id="5HVB6JRkk4D" role="1bW5cS">
+                        <node concept="3clFbF" id="5HVB6JRli3n" role="3cqZAp">
+                          <node concept="2ShNRf" id="5HVB6JRli3j" role="3clFbG">
+                            <node concept="HV5vD" id="5HVB6JRlj0s" role="2ShVmc">
+                              <ref role="HV5vE" node="5HVB6JRkwKp" resolve="TypecheckingStrategy.MemoImpl" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="6PWFJfG8yzm" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6PWFJfG8Cr2" role="jymVt" />
       <node concept="3clFb_" id="5Qx6_65rizy" role="jymVt">
         <property role="TrG5h" value="finish" />
         <node concept="3cqZAl" id="5Qx6_65uWrI" role="3clF45" />
@@ -18063,6 +18644,7 @@
                           </node>
                         </node>
                       </node>
+                      <node concept="3clFbH" id="5HVB6JRkj3n" role="3cqZAp" />
                     </node>
                   </node>
                 </node>
@@ -18194,6 +18776,7 @@
                           </node>
                         </node>
                       </node>
+                      <node concept="3clFbH" id="5HVB6JRk6Cx" role="3cqZAp" />
                     </node>
                   </node>
                 </node>
@@ -18209,7 +18792,10 @@
                   <ref role="3cqZAo" node="6$F3Z5ziOoT" resolve="session" />
                 </node>
                 <node concept="1rXfSq" id="61G6TdBAEvZ" role="37wK5m">
-                  <ref role="37wK5l" node="61G6TdB_yxW" resolve="createMacroProcessing" />
+                  <ref role="37wK5l" node="6PWFJfG8yyv" resolve="createMacroProcessing" />
+                  <node concept="37vLTw" id="6PWFJfGaco4" role="37wK5m">
+                    <ref role="3cqZAo" node="6nFpYlusyqe" resolve="aspectClique" />
+                  </node>
                   <node concept="37vLTw" id="61G6TdBAFxT" role="37wK5m">
                     <ref role="3cqZAo" node="6$F3Z5ziOoT" resolve="session" />
                   </node>
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd b/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
index ef4f6ebc..3cab306c 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
@@ -18,6 +18,7 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
     <dependency reexport="false">9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)</dependency>
+    <dependency reexport="false">f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
@@ -38,6 +39,7 @@
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="9e98f4e2-decf-4e97-bf80-9109e8b759aa(jetbrains.mps.lang.feedback.context)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
index 48836820..77685fc5 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
@@ -29,6 +29,7 @@
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
     <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
+    <import index="lehm" ref="r:464fcc95-fddb-47d1-b620-592cbf6b8bf2(jetbrains.mps.coderules.runtime.memoizer)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -1769,6 +1770,109 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5yr01fEdXuH" role="jymVt" />
+    <node concept="3clFb_" id="6PWFJfG6OFJ" role="jymVt">
+      <property role="TrG5h" value="withMemo" />
+      <node concept="37vLTG" id="6PWFJfG6SSy" role="3clF46">
+        <property role="TrG5h" value="memo" />
+        <node concept="3uibUv" id="6PWFJfG6Txt" role="1tU5fm">
+          <ref role="3uigEE" node="6PWFJfG5LMK" resolve="Memo" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="6PWFJfG6Qok" role="3clF45">
+        <ref role="3uigEE" node="18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+      </node>
+      <node concept="3Tm1VV" id="6PWFJfG6OFM" role="1B3o_S" />
+      <node concept="3clFbS" id="6PWFJfG6OFN" role="3clF47">
+        <node concept="3clFbF" id="5HVB6JRjdps" role="3cqZAp">
+          <node concept="37vLTI" id="5HVB6JRjdpu" role="3clFbG">
+            <node concept="2OqwBi" id="5HVB6JRjewh" role="37vLTJ">
+              <node concept="Xjq3P" id="5HVB6JRjexx" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5HVB6JRjewk" role="2OqNvi">
+                <ref role="2Oxat5" node="5HVB6JRjdpo" resolve="memo" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="5HVB6JRjdpy" role="37vLTx">
+              <ref role="3cqZAo" node="6PWFJfG6SSy" resolve="memo" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6PWFJfG6TPd" role="3cqZAp">
+          <node concept="Xjq3P" id="6PWFJfG6TPc" role="3clFbG" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6PWFJfG6NeX" role="jymVt" />
+    <node concept="3clFb_" id="5HVB6JR7NAD" role="jymVt">
+      <property role="TrG5h" value="memoize" />
+      <node concept="37vLTG" id="5HVB6JR7RzF" role="3clF46">
+        <property role="TrG5h" value="key" />
+        <node concept="3uibUv" id="5HVB6JR7Y5Z" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="5HVB6JR7ZtN" role="3clF46">
+        <property role="TrG5h" value="defaultValue" />
+        <node concept="3uibUv" id="5HVB6JR7ZtO" role="1tU5fm">
+          <ref role="3uigEE" to="18ew:~Computable" resolve="Computable" />
+          <node concept="16syzq" id="5HVB6JR7ZtP" role="11_B2D">
+            <ref role="16sUi3" node="5HVB6JR7X8i" resolve="T" />
+          </node>
+        </node>
+      </node>
+      <node concept="16syzq" id="5HVB6JRe6l7" role="3clF45">
+        <ref role="16sUi3" node="5HVB6JR7X8i" resolve="T" />
+      </node>
+      <node concept="3Tm1VV" id="5HVB6JR7NAG" role="1B3o_S" />
+      <node concept="3clFbS" id="5HVB6JR7NAH" role="3clF47">
+        <node concept="3clFbJ" id="5HVB6JRjeTa" role="3cqZAp">
+          <node concept="3clFbS" id="5HVB6JRjeTc" role="3clFbx">
+            <node concept="3cpWs6" id="5HVB6JRjfoR" role="3cqZAp">
+              <node concept="2OqwBi" id="5HVB6JRjgl5" role="3cqZAk">
+                <node concept="37vLTw" id="5HVB6JRjfqc" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5HVB6JRjdpo" resolve="memo" />
+                </node>
+                <node concept="liA8E" id="5HVB6JRjh93" role="2OqNvi">
+                  <ref role="37wK5l" node="6PWFJfG5MGS" resolve="getOrSetValue" />
+                  <node concept="37vLTw" id="5HVB6JRji4$" role="37wK5m">
+                    <ref role="3cqZAo" node="5HVB6JR7RzF" resolve="key" />
+                  </node>
+                  <node concept="37vLTw" id="5HVB6JRjkfn" role="37wK5m">
+                    <ref role="3cqZAo" node="5HVB6JR7ZtN" resolve="defaultValue" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="5HVB6JRjo0X" role="3cqZAp" />
+          </node>
+          <node concept="3y3z36" id="5HVB6JRjfbq" role="3clFbw">
+            <node concept="10Nm6u" id="5HVB6JRjfmS" role="3uHU7w" />
+            <node concept="37vLTw" id="5HVB6JRjeWk" role="3uHU7B">
+              <ref role="3cqZAo" node="5HVB6JRjdpo" resolve="memo" />
+            </node>
+          </node>
+          <node concept="9aQIb" id="5HVB6JRjlzf" role="9aQIa">
+            <node concept="3clFbS" id="5HVB6JRjlzg" role="9aQI4">
+              <node concept="3cpWs6" id="5HVB6JRjmhn" role="3cqZAp">
+                <node concept="2YIFZM" id="5HVB6JRjmho" role="3cqZAk">
+                  <ref role="37wK5l" to="lehm:2tjs8VC2Blb" resolve="getOrPut" />
+                  <ref role="1Pybhc" to="lehm:2tjs8VC0K0m" resolve="Memoizer" />
+                  <node concept="37vLTw" id="5HVB6JRjmhp" role="37wK5m">
+                    <ref role="3cqZAo" node="5HVB6JR7RzF" resolve="key" />
+                  </node>
+                  <node concept="37vLTw" id="5HVB6JRjmhq" role="37wK5m">
+                    <ref role="3cqZAo" node="5HVB6JR7ZtN" resolve="defaultValue" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="16euLQ" id="5HVB6JR7X8i" role="16eVyc">
+        <property role="TrG5h" value="T" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5HVB6JR7MA4" role="jymVt" />
     <node concept="3clFb_" id="36tQV5BDE0Q" role="jymVt">
       <property role="TrG5h" value="require" />
       <property role="1EzhhJ" value="false" />
@@ -2470,6 +2574,13 @@
       </node>
     </node>
     <node concept="3Tm1VV" id="18kNIl1vDQ0" role="1B3o_S" />
+    <node concept="312cEg" id="5HVB6JRjdpo" role="jymVt">
+      <property role="TrG5h" value="memo" />
+      <node concept="3Tm6S6" id="5HVB6JRjdpp" role="1B3o_S" />
+      <node concept="3uibUv" id="5HVB6JRjdpr" role="1tU5fm">
+        <ref role="3uigEE" node="6PWFJfG5LMK" resolve="Memo" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="7nPD14OaO1O">
     <property role="TrG5h" value="RuleEx" />
@@ -7585,5 +7696,37 @@
     </node>
     <node concept="3Tm1VV" id="5tAk4yVWROV" role="1B3o_S" />
   </node>
+  <node concept="3HP615" id="6PWFJfG5LMK">
+    <property role="TrG5h" value="Memo" />
+    <node concept="2tJIrI" id="6PWFJfG5LT0" role="jymVt" />
+    <node concept="3clFb_" id="6PWFJfG5MGS" role="jymVt">
+      <property role="TrG5h" value="getOrSetValue" />
+      <node concept="37vLTG" id="6PWFJfG5Nrn" role="3clF46">
+        <property role="TrG5h" value="key" />
+        <node concept="3uibUv" id="6PWFJfG5NBb" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="6PWFJfG5NL_" role="3clF46">
+        <property role="TrG5h" value="defaultValue" />
+        <node concept="3uibUv" id="6PWFJfG5NZT" role="1tU5fm">
+          <ref role="3uigEE" to="18ew:~Computable" resolve="Computable" />
+          <node concept="16syzq" id="6PWFJfG5Olr" role="11_B2D">
+            <ref role="16sUi3" node="6PWFJfG5Oep" resolve="T" />
+          </node>
+        </node>
+      </node>
+      <node concept="16syzq" id="5HVB6JRjp3C" role="3clF45">
+        <ref role="16sUi3" node="6PWFJfG5Oep" resolve="T" />
+      </node>
+      <node concept="3Tm1VV" id="6PWFJfG5MGV" role="1B3o_S" />
+      <node concept="3clFbS" id="6PWFJfG5MGW" role="3clF47" />
+      <node concept="16euLQ" id="6PWFJfG5Oep" role="16eVyc">
+        <property role="TrG5h" value="T" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6PWFJfG5LT5" role="jymVt" />
+    <node concept="3Tm1VV" id="6PWFJfG5LML" role="1B3o_S" />
+  </node>
 </model>