diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_long/default_ram_cache.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_long/default_ram_cache.xml
index d241da4b4ea292a6eeb3cd4ad57777b0f58ed63f..24aaeaceefd642ad1d61af24c8869e9dd2f2e1d1 100644
--- a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_long/default_ram_cache.xml
+++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_long/default_ram_cache.xml
@@ -52,25 +52,13 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </pickle>
     <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -78,13 +66,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_medium/default_ram_cache.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_medium/default_ram_cache.xml
index 2a942420d4f9af6b2564b02dd0bb657a0861d4a8..703e11442f4a916e5fc3dd418196530370b558c2 100644
--- a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_medium/default_ram_cache.xml
+++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_medium/default_ram_cache.xml
@@ -52,25 +52,13 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </pickle>
     <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -78,13 +66,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_short/default_ram_cache.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_short/default_ram_cache.xml
index e12c45b1f34d0a3cc7260d4a91d3178f47dc6081..3f3f2aefed99f0b1c8e5b1caba7b98e3e21fce4c 100644
--- a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_short/default_ram_cache.xml
+++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_short/default_ram_cache.xml
@@ -52,25 +52,13 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </pickle>
     <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -78,13 +66,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_session_cache/1.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_session_cache/1.xml
index 69c3395389995129611415d96e3d8acfd26d69ee..b712e9e0cce04dc8b4646dedfd5388f6d0820397 100644
--- a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_session_cache/1.xml
+++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_session_cache/1.xml
@@ -52,25 +52,13 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </pickle>
     <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -78,13 +66,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_long/default_ram_cache.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_long/default_ram_cache.xml
index d241da4b4ea292a6eeb3cd4ad57777b0f58ed63f..24aaeaceefd642ad1d61af24c8869e9dd2f2e1d1 100644
--- a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_long/default_ram_cache.xml
+++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_long/default_ram_cache.xml
@@ -52,25 +52,13 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </pickle>
     <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -78,13 +66,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_medium/default_ram_cache.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_medium/default_ram_cache.xml
index 2a942420d4f9af6b2564b02dd0bb657a0861d4a8..703e11442f4a916e5fc3dd418196530370b558c2 100644
--- a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_medium/default_ram_cache.xml
+++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_medium/default_ram_cache.xml
@@ -52,25 +52,13 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </pickle>
     <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -78,13 +66,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_short/default_ram_cache.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_short/default_ram_cache.xml
index e12c45b1f34d0a3cc7260d4a91d3178f47dc6081..3f3f2aefed99f0b1c8e5b1caba7b98e3e21fce4c 100644
--- a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_short/default_ram_cache.xml
+++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_short/default_ram_cache.xml
@@ -52,25 +52,13 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </pickle>
     <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -78,13 +66,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 1fec687c11d32c239e8f604188fbeefe6dfa4e74..dc7d8743bdb069a398b5ab58b4950102aa024d91 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-1628
\ No newline at end of file
+1629
\ No newline at end of file