diff --git a/lib/zin/core/node.class.php b/lib/zin/core/node.class.php
index d2e61af7d4..c666f41700 100644
--- a/lib/zin/core/node.class.php
+++ b/lib/zin/core/node.class.php
@@ -59,7 +59,8 @@ class node implements \JsonSerializable
 
     public function __construct(mixed ...$args)
     {
-        $this->gid   = 'zin_' . uniqid();
+        global $config;
+        $this->gid   = (isset($config->zinTool) && $config->zinTool) ? static::nextGid() : 'zin_' . uniqid();
         $this->props = new props();
 
         disableGlobalRender();
diff --git a/www/js/zui3/zin.js b/www/js/zui3/zin.js
index 54827147c2..994da92914 100644
--- a/www/js/zui3/zin.js
+++ b/www/js/zui3/zin.js
@@ -475,7 +475,7 @@
         if(options.modal) headers['X-Zui-Modal'] = 'true';
         const requestMethod = (options.method || 'GET').toUpperCase();
         if(!options.cache && options.cache !== false) options.cache = requestMethod === 'GET' ? (url + (url.includes('?') ? '&zin=' : '?zin=') + encodeURIComponent(selectors.join(','))) : false;
-        options.cache = false; // Disable local cache for 20.1.
+        if(!window.zin || !window.zin.zinTool) options.cache = false;
         const cacheKey = options.cache;
         let cache;
         const renderPageData = (data, onlyZinDebug) =>