diff --git a/Sda2/Ref/Fig/jpacache.svg b/Sda2/Ref/Fig/jpacache.svg
index 8ecaf808af2105905105744a4a14ae3c15731506..c9ebd1db418d8b8102cd74cf04cbe2e6a9d6d3dc 100644
--- a/Sda2/Ref/Fig/jpacache.svg
+++ b/Sda2/Ref/Fig/jpacache.svg
@@ -25,10 +25,10 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.3667619"
-     inkscape:cx="523.92553"
-     inkscape:cy="400.01611"
+     inkscape:cx="439.84565"
+     inkscape:cy="372.04725"
      inkscape:document-units="px"
-     inkscape:current-layer="g3280"
+     inkscape:current-layer="layer7"
      showgrid="true"
      inkscape:window-width="1600"
      inkscape:window-height="1176"
@@ -1428,7 +1428,7 @@
          sodipodi:open="true"
          sodipodi:end="6.2802964"
          sodipodi:start="0"
-         d="m 590,229.09448 c 0,30.37566 -38.0558,55 -85,55 -46.9442,0 -85,-24.62434 -85,-55 0,-30.37566 38.0558,-55 85,-55 46.84834,0 84.8643,24.52761 84.99965,54.84111"
+         d="m 590,229.09448 a 85,55 0 1 1 -3.5e-4,-0.15889"
          sodipodi:ry="55"
          sodipodi:rx="85"
          sodipodi:cy="229.09448"
@@ -1691,7 +1691,7 @@
            y="185.8407" /></flowRegion><flowPara
          id="flowPara7087" /></flowRoot>  </g>
   <g
-     style="display:inline"
+     style="display:none"
      inkscape:label="L2 entity hydrating"
      id="g3280"
      inkscape:groupmode="layer">
@@ -2002,13 +2002,80 @@
        id="text4862"
        sodipodi:linespacing="125%"><tspan
          sodipodi:role="line"
-         id="tspan4864" /></text>
+         id="tspan4864"
+         x="701.65845"
+         y="557.52209" /></text>
     <path
        style="color:#000000;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        d="m 480,124.09448 560,0"
        id="path3343"
        inkscape:connector-curvature="0" />
   </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer7"
+     inkscape:label="Cache configuration levels"
+     style="display:inline">
+    <text
+       sodipodi:linespacing="125%"
+       id="text3300-19-3"
+       y="174.09448"
+       x="20"
+       style="font-size:36px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
+       xml:space="preserve"
+       inkscape:transform-center-x="12.199219"><tspan
+         id="tspan3302-59-5"
+         y="174.09448"
+         x="20"
+         sodipodi:role="line">➢ Class</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text3278-3"
+       y="44.094482"
+       x="10"
+       style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
+       xml:space="preserve"><tspan
+         y="44.094482"
+         x="10"
+         id="tspan3280-5"
+         sodipodi:role="line">Cache configuration level</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text3300-19-3-5"
+       y="234.09448"
+       x="20"
+       style="font-size:36px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
+       xml:space="preserve"
+       inkscape:transform-center-x="12.199219"><tspan
+         id="tspan3302-59-5-1"
+         y="234.09448"
+         x="20"
+         sodipodi:role="line">➢ Persistence unit</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text3300-19-3-4"
+       y="294.09448"
+       x="20"
+       style="font-size:36px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
+       xml:space="preserve"
+       inkscape:transform-center-x="12.199219"><tspan
+         id="tspan3302-59-5-9"
+         y="294.09448"
+         x="20"
+         sodipodi:role="line">➢ Programmatic</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text3300-19-3-6"
+       y="354.09448"
+       x="20"
+       style="font-size:36px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
+       xml:space="preserve"
+       inkscape:transform-center-x="12.199219"><tspan
+         id="tspan3302-59-5-4"
+         y="354.09448"
+         x="20"
+         sodipodi:role="line">➢ Vendor specific (ehcache.xml)</tspan></text>
+  </g>
   <g
      inkscape:groupmode="layer"
      id="layer5"