=== modified file 'src/com/goldencode/p2j/persist/DynamicQueryHelper.java'
--- old/src/com/goldencode/p2j/persist/DynamicQueryHelper.java	2025-06-17 14:10:02 +0000
+++ new/src/com/goldencode/p2j/persist/DynamicQueryHelper.java	2025-10-16 11:52:59 +0000
@@ -374,11 +374,11 @@
       String              level1Key  = getCacheKey(predicate0, null, 1);
       QueryCacheKey       cache1key  = new QueryCacheKey(level1Key, allBuffers);
       
-      synchronized (lvl1Cache)
-      {
-         // check the cache for a previously constructed JAST
-         pJast = lvl1Cache.get(cache1key);
-      }
+//      synchronized (lvl1Cache)
+//      {
+//         // check the cache for a previously constructed JAST
+//         pJast = lvl1Cache.get(cache1key);
+//      }
       
       if (pJast == null)
       {
@@ -603,11 +603,11 @@
                   // before going forward with conversion, check if we have an already prepared
                   // JAST for this AST
                   cache2key = new QueryCacheKey(level2Key[0], allBuffers);
-                  synchronized (lvl2Cache)
-                  {
-                     // check the cache for a previously constructed JAST
-                     qAst = lvl2Cache.get(cache2key);
-                  }
+//                  synchronized (lvl2Cache)
+//                  {
+//                     // check the cache for a previously constructed JAST
+//                     qAst = lvl2Cache.get(cache2key);
+//                  }
                   
                   // qAst for this query not found in cache, convert the pAst now
                   if (qAst == null)
@@ -1607,7 +1607,7 @@
             
             return false;
          }
-         
+
          if (idx != i)
          {
             String errMsg = "Buffer " + realBuffer + " is not referenced in the same order in " +

=== modified file 'src/com/goldencode/p2j/persist/DynamicTablesHelper.java'
--- old/src/com/goldencode/p2j/persist/DynamicTablesHelper.java	2025-07-31 06:05:26 +0000
+++ new/src/com/goldencode/p2j/persist/DynamicTablesHelper.java	2025-10-14 13:18:05 +0000
@@ -1198,13 +1198,13 @@
       
       // check the cache first
       CacheKey cacheKey = new CacheKey(allFields, allIndexes);
-      CacheData cacheData;
+      CacheData cacheData = null;
       boolean classLoadingFailed = false;
       
-      synchronized (cacheLock)
-      {
-         cacheData = cache.get(cacheKey);
-      }
+//      synchronized (cacheLock)
+//      {
+//         cacheData = cache.get(cacheKey);
+//      }
 
       DmoMeta dmoMeta = null;
       Class<? extends DataModelObject> dmoIface = null;