From 5ba93eace3de5a4d5af5aeed29ed031cb9c5ea54 Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Mon, 22 Jun 2026 13:10:58 +0530
Subject: [PATCH 1/5] Fence document cache fills

---
 composer.json             |   8 +-
 composer.lock             | 162 +++++++++++++++++++++-----------------
 src/Database/Database.php |  17 +++-
 3 files changed, 109 insertions(+), 78 deletions(-)

diff --git a/composer.json b/composer.json
index 24226eb97..80ffa5542 100755
--- a/composer.json
+++ b/composer.json
@@ -32,6 +32,12 @@
         "check": "./vendor/bin/phpstan analyse --level 7 src tests --memory-limit 2G",
         "coverage": "./vendor/bin/coverage-check ./tmp/clover.xml 90"
     },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/utopia-php/cache"
+        }
+    ],
     "require": {
         "php": ">=8.4",
         "ext-pdo": "*",
@@ -40,7 +46,7 @@
         "ext-redis": "*",
         "utopia-php/validators": "0.2.*",
         "utopia-php/console": "0.1.*",
-        "utopia-php/cache": "^3.0",
+        "utopia-php/cache": "dev-cache-lease-fence",
         "utopia-php/pools": "1.*",
         "utopia-php/mongo": "1.*"
     },
diff --git a/composer.lock b/composer.lock
index 67a8878a0..60af66953 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,27 +4,26 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f5fb1745555c5cd00d14474561bf0095",
+    "content-hash": "1e92b05dc9bef9bfa5b7ba59c944af2c",
     "packages": [
         {
             "name": "brick/math",
-            "version": "0.14.8",
+            "version": "0.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/brick/math.git",
-                "reference": "63422359a44b7f06cae63c3b429b59e8efcc0629"
+                "reference": "82944324d1c1bdb2c2618e89978d4e2ad78d69ad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/63422359a44b7f06cae63c3b429b59e8efcc0629",
-                "reference": "63422359a44b7f06cae63c3b429b59e8efcc0629",
+                "url": "https://api.github.com/repos/brick/math/zipball/82944324d1c1bdb2c2618e89978d4e2ad78d69ad",
+                "reference": "82944324d1c1bdb2c2618e89978d4e2ad78d69ad",
                 "shasum": ""
             },
             "require": {
                 "php": "^8.2"
             },
             "require-dev": {
-                "php-coveralls/php-coveralls": "^2.2",
                 "phpstan/phpstan": "2.1.22",
                 "phpunit/phpunit": "^11.5"
             },
@@ -56,7 +55,7 @@
             ],
             "support": {
                 "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.14.8"
+                "source": "https://github.com/brick/math/tree/0.18.0"
             },
             "funding": [
                 {
@@ -64,7 +63,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-02-10T14:33:43+00:00"
+            "time": "2026-06-14T18:21:03+00:00"
         },
         {
             "name": "composer/semver",
@@ -1238,20 +1237,20 @@
         },
         {
             "name": "ramsey/uuid",
-            "version": "4.9.2",
+            "version": "4.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "8429c78ca35a09f27565311b98101e2826affde0"
+                "reference": "1df15849d00943a67d677dc9cfd80795f038c9f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/8429c78ca35a09f27565311b98101e2826affde0",
-                "reference": "8429c78ca35a09f27565311b98101e2826affde0",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/1df15849d00943a67d677dc9cfd80795f038c9f8",
+                "reference": "1df15849d00943a67d677dc9cfd80795f038c9f8",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.8.16 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13 || ^0.14",
+                "brick/math": ">=0.8.16 <=0.18",
                 "php": "^8.0",
                 "ramsey/collection": "^1.2 || ^2.0"
             },
@@ -1310,9 +1309,9 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.9.2"
+                "source": "https://github.com/ramsey/uuid/tree/4.9.3"
             },
-            "time": "2025-12-14T04:43:48+00:00"
+            "time": "2026-06-18T03:57:49+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -1387,16 +1386,16 @@
         },
         {
             "name": "symfony/http-client",
-            "version": "v7.4.9",
+            "version": "v7.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client.git",
-                "reference": "7e941c6abf4e3bf7dca160bf0e11ef36a9f832f6"
+                "reference": "e8a112b8415707265a7e614278136a9d92989a6a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/7e941c6abf4e3bf7dca160bf0e11ef36a9f832f6",
-                "reference": "7e941c6abf4e3bf7dca160bf0e11ef36a9f832f6",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/e8a112b8415707265a7e614278136a9d92989a6a",
+                "reference": "e8a112b8415707265a7e614278136a9d92989a6a",
                 "shasum": ""
             },
             "require": {
@@ -1464,7 +1463,7 @@
                 "http"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client/tree/v7.4.9"
+                "source": "https://github.com/symfony/http-client/tree/v7.4.13"
             },
             "funding": [
                 {
@@ -1484,7 +1483,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-04-29T13:25:15+00:00"
+            "time": "2026-05-24T09:57:54+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
@@ -1570,16 +1569,16 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.37.0",
+            "version": "v1.38.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "6a21eb99c6973357967f6ce3708cd55a6bec6315"
+                "reference": "d3d318bad5e7a1bfbd026009c8bfb8d8f99ae6b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6a21eb99c6973357967f6ce3708cd55a6bec6315",
-                "reference": "6a21eb99c6973357967f6ce3708cd55a6bec6315",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d3d318bad5e7a1bfbd026009c8bfb8d8f99ae6b6",
+                "reference": "d3d318bad5e7a1bfbd026009c8bfb8d8f99ae6b6",
                 "shasum": ""
             },
             "require": {
@@ -1631,7 +1630,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.37.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.38.2"
             },
             "funding": [
                 {
@@ -1651,20 +1650,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-04-10T17:25:58+00:00"
+            "time": "2026-05-27T06:59:30+00:00"
         },
         {
             "name": "symfony/polyfill-php82",
-            "version": "v1.37.0",
+            "version": "v1.38.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php82.git",
-                "reference": "34808efe3e68f69685796f7c253a2f1d8ea9df59"
+                "reference": "002dc0cfe5fd4ed6033d48f27d4f19a486c4b04b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php82/zipball/34808efe3e68f69685796f7c253a2f1d8ea9df59",
-                "reference": "34808efe3e68f69685796f7c253a2f1d8ea9df59",
+                "url": "https://api.github.com/repos/symfony/polyfill-php82/zipball/002dc0cfe5fd4ed6033d48f27d4f19a486c4b04b",
+                "reference": "002dc0cfe5fd4ed6033d48f27d4f19a486c4b04b",
                 "shasum": ""
             },
             "require": {
@@ -1711,7 +1710,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php82/tree/v1.37.0"
+                "source": "https://github.com/symfony/polyfill-php82/tree/v1.38.1"
             },
             "funding": [
                 {
@@ -1731,20 +1730,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-04-10T16:19:22+00:00"
+            "time": "2026-05-26T12:45:58+00:00"
         },
         {
             "name": "symfony/polyfill-php83",
-            "version": "v1.37.0",
+            "version": "v1.38.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php83.git",
-                "reference": "3600c2cb22399e25bb226e4a135ce91eeb2a6149"
+                "reference": "796a26abb75ce49f3a84433cd81bf1009d73d5f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/3600c2cb22399e25bb226e4a135ce91eeb2a6149",
-                "reference": "3600c2cb22399e25bb226e4a135ce91eeb2a6149",
+                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/796a26abb75ce49f3a84433cd81bf1009d73d5f8",
+                "reference": "796a26abb75ce49f3a84433cd81bf1009d73d5f8",
                 "shasum": ""
             },
             "require": {
@@ -1791,7 +1790,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php83/tree/v1.37.0"
+                "source": "https://github.com/symfony/polyfill-php83/tree/v1.38.2"
             },
             "funding": [
                 {
@@ -1811,7 +1810,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-04-10T17:25:58+00:00"
+            "time": "2026-05-27T06:51:48+00:00"
         },
         {
             "name": "symfony/polyfill-php85",
@@ -2034,16 +2033,16 @@
         },
         {
             "name": "utopia-php/cache",
-            "version": "3.0.0",
+            "version": "dev-cache-lease-fence",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/cache.git",
-                "reference": "ece1f4d11ec2804cd7e05b9717dc7a2bc66e4176"
+                "reference": "e1d2a7bc0e9add0f0611d79df7fb43b07f998be5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/cache/zipball/ece1f4d11ec2804cd7e05b9717dc7a2bc66e4176",
-                "reference": "ece1f4d11ec2804cd7e05b9717dc7a2bc66e4176",
+                "url": "https://api.github.com/repos/utopia-php/cache/zipball/e1d2a7bc0e9add0f0611d79df7fb43b07f998be5",
+                "reference": "e1d2a7bc0e9add0f0611d79df7fb43b07f998be5",
                 "shasum": ""
             },
             "require": {
@@ -2068,7 +2067,22 @@
                     "Utopia\\Cache\\": "src/Cache"
                 }
             },
-            "notification-url": "https://packagist.org/downloads/",
+            "autoload-dev": {
+                "psr-4": {
+                    "Utopia\\Tests\\": "tests/Cache"
+                }
+            },
+            "scripts": {
+                "check": [
+                    "./vendor/bin/phpstan analyse --level max src tests"
+                ],
+                "lint": [
+                    "./vendor/bin/pint --test"
+                ],
+                "format": [
+                    "./vendor/bin/pint"
+                ]
+            },
             "license": [
                 "MIT"
             ],
@@ -2081,23 +2095,23 @@
                 "utopia"
             ],
             "support": {
-                "issues": "https://github.com/utopia-php/cache/issues",
-                "source": "https://github.com/utopia-php/cache/tree/3.0.0"
+                "source": "https://github.com/utopia-php/cache/tree/cache-lease-fence",
+                "issues": "https://github.com/utopia-php/cache/issues"
             },
-            "time": "2026-05-14T14:13:17+00:00"
+            "time": "2026-06-22T07:37:47+00:00"
         },
         {
             "name": "utopia-php/circuit-breaker",
-            "version": "0.3.0",
+            "version": "0.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/circuit-breaker.git",
-                "reference": "064243c1667778c00abf027ff53a735a228776de"
+                "reference": "db5d77f6c99ebce2ee81bd8ed4ae8f41bd2b0828"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/circuit-breaker/zipball/064243c1667778c00abf027ff53a735a228776de",
-                "reference": "064243c1667778c00abf027ff53a735a228776de",
+                "url": "https://api.github.com/repos/utopia-php/circuit-breaker/zipball/db5d77f6c99ebce2ee81bd8ed4ae8f41bd2b0828",
+                "reference": "db5d77f6c99ebce2ee81bd8ed4ae8f41bd2b0828",
                 "shasum": ""
             },
             "require": {
@@ -2107,7 +2121,7 @@
                 "laravel/pint": "^1.29",
                 "phpstan/phpstan": "^2.1",
                 "phpunit/phpunit": "^10.0",
-                "utopia-php/telemetry": "0.2.*"
+                "utopia-php/telemetry": "^0.4"
             },
             "suggest": {
                 "ext-opentelemetry": "Required by utopia-php/telemetry when using OpenTelemetry metrics.",
@@ -2144,9 +2158,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/circuit-breaker/issues",
-                "source": "https://github.com/utopia-php/circuit-breaker/tree/0.3.0"
+                "source": "https://github.com/utopia-php/circuit-breaker/tree/0.3.1"
             },
-            "time": "2026-05-12T04:27:08+00:00"
+            "time": "2026-05-29T12:12:23+00:00"
         },
         {
             "name": "utopia-php/console",
@@ -2259,28 +2273,28 @@
         },
         {
             "name": "utopia-php/pools",
-            "version": "1.0.3",
+            "version": "1.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/pools.git",
-                "reference": "74de7c5457a2c447f27e7ec4d72e8412a7d68c10"
+                "reference": "b685ca01883ed820b9898b85163a8f3d970a2da7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/pools/zipball/74de7c5457a2c447f27e7ec4d72e8412a7d68c10",
-                "reference": "74de7c5457a2c447f27e7ec4d72e8412a7d68c10",
+                "url": "https://api.github.com/repos/utopia-php/pools/zipball/b685ca01883ed820b9898b85163a8f3d970a2da7",
+                "reference": "b685ca01883ed820b9898b85163a8f3d970a2da7",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.4",
-                "utopia-php/telemetry": "*"
+                "utopia-php/telemetry": "^0.4"
             },
             "require-dev": {
-                "laravel/pint": "1.*",
-                "phpstan/phpstan": "1.*",
-                "phpunit/phpunit": "11.*",
                 "swoole/ide-helper": "6.*"
             },
+            "suggest": {
+                "ext-swoole": "Required to use the Swoole pool adapter"
+            },
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -2306,22 +2320,22 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/pools/issues",
-                "source": "https://github.com/utopia-php/pools/tree/1.0.3"
+                "source": "https://github.com/utopia-php/pools/tree/1.0.8"
             },
-            "time": "2026-02-26T08:42:40+00:00"
+            "time": "2026-06-20T09:45:06+00:00"
         },
         {
             "name": "utopia-php/telemetry",
-            "version": "0.3.0",
+            "version": "0.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/telemetry.git",
-                "reference": "62bbadad03e593b071b8ca63fac2c117c1900991"
+                "reference": "50491fb1686a9796e9cd5005ede6141e2ceeb5ac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/telemetry/zipball/62bbadad03e593b071b8ca63fac2c117c1900991",
-                "reference": "62bbadad03e593b071b8ca63fac2c117c1900991",
+                "url": "https://api.github.com/repos/utopia-php/telemetry/zipball/50491fb1686a9796e9cd5005ede6141e2ceeb5ac",
+                "reference": "50491fb1686a9796e9cd5005ede6141e2ceeb5ac",
                 "shasum": ""
             },
             "require": {
@@ -2334,10 +2348,7 @@
                 "symfony/http-client": "7.*"
             },
             "require-dev": {
-                "laravel/pint": "1.*",
                 "phpbench/phpbench": "1.*",
-                "phpstan/phpstan": "2.*",
-                "phpunit/phpunit": "11.*",
                 "swoole/ide-helper": "6.*"
             },
             "suggest": {
@@ -2354,6 +2365,7 @@
             "license": [
                 "MIT"
             ],
+            "description": "A lite & fast telemetry library, with adapters for OpenTelemetry",
             "keywords": [
                 "framework",
                 "php",
@@ -2361,9 +2373,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/telemetry/issues",
-                "source": "https://github.com/utopia-php/telemetry/tree/0.3.0"
+                "source": "https://github.com/utopia-php/telemetry/tree/0.4.3"
             },
-            "time": "2026-04-01T13:52:56+00:00"
+            "time": "2026-06-20T09:45:06+00:00"
         },
         {
             "name": "utopia-php/validators",
@@ -4653,7 +4665,9 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {},
+    "stability-flags": {
+        "utopia-php/cache": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
diff --git a/src/Database/Database.php b/src/Database/Database.php
index 5a6cd97d7..a3479e4be 100644
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -4879,6 +4879,15 @@ public function getDocument(string $collection, string $id, array $queries = [],
             return $document;
         }
 
+        $cacheLease = false;
+        if (!$forUpdate && empty($relationships)) {
+            try {
+                $cacheLease = $this->cache->lease($documentKey, $hashKey, self::TTL);
+            } catch (Exception $e) {
+                Console::warning('Warning: Failed to lease document cache: ' . $e->getMessage());
+            }
+        }
+
         $document = $this->adapter->getDocument(
             $collection,
             $id,
@@ -4929,10 +4938,12 @@ public function getDocument(string $collection, string $id, array $queries = [],
         // Don't save to cache if it's part of a relationship, or if this is a
         // locking read: a forUpdate read happens inside an open transaction, and
         // caching the pre-commit row would poison the cache for other readers.
-        if (!$forUpdate && empty($relationships)) {
+        if (!$forUpdate && empty($relationships) && $cacheLease !== false) {
             try {
-                $this->cache->save($documentKey, $document->getArrayCopy(), $hashKey);
-                $this->cache->save($collectionKey, 'empty', $documentKey);
+                $cached = $this->cache->saveLease($documentKey, $document->getArrayCopy(), $cacheLease, $hashKey);
+                if ($cached !== false) {
+                    $this->cache->save($collectionKey, 'empty', $documentKey);
+                }
             } catch (Exception $e) {
                 Console::warning('Failed to save document to cache: ' . $e->getMessage());
             }

From 6906d37b661cb79cab5d79348d3ed6ff3ba98bfa Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Mon, 22 Jun 2026 13:58:39 +0530
Subject: [PATCH 2/5] Restore collection cache index writes

---
 composer.lock             | 8 ++++----
 src/Database/Database.php | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/composer.lock b/composer.lock
index 60af66953..9cdaa5954 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2037,12 +2037,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/cache.git",
-                "reference": "e1d2a7bc0e9add0f0611d79df7fb43b07f998be5"
+                "reference": "40abe906015f481117157e63831d30d36ec384c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/cache/zipball/e1d2a7bc0e9add0f0611d79df7fb43b07f998be5",
-                "reference": "e1d2a7bc0e9add0f0611d79df7fb43b07f998be5",
+                "url": "https://api.github.com/repos/utopia-php/cache/zipball/40abe906015f481117157e63831d30d36ec384c6",
+                "reference": "40abe906015f481117157e63831d30d36ec384c6",
                 "shasum": ""
             },
             "require": {
@@ -2098,7 +2098,7 @@
                 "source": "https://github.com/utopia-php/cache/tree/cache-lease-fence",
                 "issues": "https://github.com/utopia-php/cache/issues"
             },
-            "time": "2026-06-22T07:37:47+00:00"
+            "time": "2026-06-22T08:27:54+00:00"
         },
         {
             "name": "utopia-php/circuit-breaker",
diff --git a/src/Database/Database.php b/src/Database/Database.php
index a3479e4be..78b888196 100644
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -4938,12 +4938,13 @@ public function getDocument(string $collection, string $id, array $queries = [],
         // Don't save to cache if it's part of a relationship, or if this is a
         // locking read: a forUpdate read happens inside an open transaction, and
         // caching the pre-commit row would poison the cache for other readers.
-        if (!$forUpdate && empty($relationships) && $cacheLease !== false) {
+        if (!$forUpdate && empty($relationships)) {
             try {
-                $cached = $this->cache->saveLease($documentKey, $document->getArrayCopy(), $cacheLease, $hashKey);
-                if ($cached !== false) {
-                    $this->cache->save($collectionKey, 'empty', $documentKey);
+                if ($cacheLease !== false) {
+                    $this->cache->saveLease($documentKey, $document->getArrayCopy(), $cacheLease, $hashKey);
                 }
+
+                $this->cache->save($collectionKey, 'empty', $documentKey);
             } catch (Exception $e) {
                 Console::warning('Failed to save document to cache: ' . $e->getMessage());
             }

From c81836d226cc3172b6d826ed86e6448419278c2b Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Mon, 22 Jun 2026 14:05:45 +0530
Subject: [PATCH 3/5] Clear empty document cache leases

---
 src/Database/Database.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/Database/Database.php b/src/Database/Database.php
index 78b888196..802103ec3 100644
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -4896,10 +4896,26 @@ public function getDocument(string $collection, string $id, array $queries = [],
         );
 
         if ($document->isEmpty()) {
+            if ($cacheLease !== false) {
+                try {
+                    $this->cache->purge($documentKey, $hashKey);
+                } catch (Exception $e) {
+                    Console::warning('Failed to purge empty document cache lease: ' . $e->getMessage());
+                }
+            }
+
             return $this->createDocumentInstance($collection->getId(), []);
         }
 
         if ($this->isTtlExpired($collection, $document)) {
+            if ($cacheLease !== false) {
+                try {
+                    $this->cache->purge($documentKey, $hashKey);
+                } catch (Exception $e) {
+                    Console::warning('Failed to purge expired document cache lease: ' . $e->getMessage());
+                }
+            }
+
             return $this->createDocumentInstance($collection->getId(), []);
         }
 

From 10c70f1d181fc136e08ea1dd4ab1d638525b6ae7 Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Mon, 22 Jun 2026 14:26:45 +0530
Subject: [PATCH 4/5] Use hidden cache fill fencing

---
 composer.lock             |  8 ++++----
 src/Database/Database.php | 30 +-----------------------------
 2 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/composer.lock b/composer.lock
index 9cdaa5954..d1215df98 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2037,12 +2037,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/cache.git",
-                "reference": "40abe906015f481117157e63831d30d36ec384c6"
+                "reference": "f97466b0d648cb3f4a92245396d913a602178f02"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/cache/zipball/40abe906015f481117157e63831d30d36ec384c6",
-                "reference": "40abe906015f481117157e63831d30d36ec384c6",
+                "url": "https://api.github.com/repos/utopia-php/cache/zipball/f97466b0d648cb3f4a92245396d913a602178f02",
+                "reference": "f97466b0d648cb3f4a92245396d913a602178f02",
                 "shasum": ""
             },
             "require": {
@@ -2098,7 +2098,7 @@
                 "source": "https://github.com/utopia-php/cache/tree/cache-lease-fence",
                 "issues": "https://github.com/utopia-php/cache/issues"
             },
-            "time": "2026-06-22T08:27:54+00:00"
+            "time": "2026-06-22T08:55:59+00:00"
         },
         {
             "name": "utopia-php/circuit-breaker",
diff --git a/src/Database/Database.php b/src/Database/Database.php
index 802103ec3..5a6cd97d7 100644
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -4879,15 +4879,6 @@ public function getDocument(string $collection, string $id, array $queries = [],
             return $document;
         }
 
-        $cacheLease = false;
-        if (!$forUpdate && empty($relationships)) {
-            try {
-                $cacheLease = $this->cache->lease($documentKey, $hashKey, self::TTL);
-            } catch (Exception $e) {
-                Console::warning('Warning: Failed to lease document cache: ' . $e->getMessage());
-            }
-        }
-
         $document = $this->adapter->getDocument(
             $collection,
             $id,
@@ -4896,26 +4887,10 @@ public function getDocument(string $collection, string $id, array $queries = [],
         );
 
         if ($document->isEmpty()) {
-            if ($cacheLease !== false) {
-                try {
-                    $this->cache->purge($documentKey, $hashKey);
-                } catch (Exception $e) {
-                    Console::warning('Failed to purge empty document cache lease: ' . $e->getMessage());
-                }
-            }
-
             return $this->createDocumentInstance($collection->getId(), []);
         }
 
         if ($this->isTtlExpired($collection, $document)) {
-            if ($cacheLease !== false) {
-                try {
-                    $this->cache->purge($documentKey, $hashKey);
-                } catch (Exception $e) {
-                    Console::warning('Failed to purge expired document cache lease: ' . $e->getMessage());
-                }
-            }
-
             return $this->createDocumentInstance($collection->getId(), []);
         }
 
@@ -4956,10 +4931,7 @@ public function getDocument(string $collection, string $id, array $queries = [],
         // caching the pre-commit row would poison the cache for other readers.
         if (!$forUpdate && empty($relationships)) {
             try {
-                if ($cacheLease !== false) {
-                    $this->cache->saveLease($documentKey, $document->getArrayCopy(), $cacheLease, $hashKey);
-                }
-
+                $this->cache->save($documentKey, $document->getArrayCopy(), $hashKey);
                 $this->cache->save($collectionKey, 'empty', $documentKey);
             } catch (Exception $e) {
                 Console::warning('Failed to save document to cache: ' . $e->getMessage());

From a8ca0929a4f8cd9781eaad928f925e269db7c616 Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Mon, 22 Jun 2026 14:38:14 +0530
Subject: [PATCH 5/5] Update cache dev dependency

---
 composer.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.lock b/composer.lock
index d1215df98..681f5824b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2037,12 +2037,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/cache.git",
-                "reference": "f97466b0d648cb3f4a92245396d913a602178f02"
+                "reference": "83898b10d6a0452a00bcf32ef4fbd3dca66eb9c2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/cache/zipball/f97466b0d648cb3f4a92245396d913a602178f02",
-                "reference": "f97466b0d648cb3f4a92245396d913a602178f02",
+                "url": "https://api.github.com/repos/utopia-php/cache/zipball/83898b10d6a0452a00bcf32ef4fbd3dca66eb9c2",
+                "reference": "83898b10d6a0452a00bcf32ef4fbd3dca66eb9c2",
                 "shasum": ""
             },
             "require": {
@@ -2098,7 +2098,7 @@
                 "source": "https://github.com/utopia-php/cache/tree/cache-lease-fence",
                 "issues": "https://github.com/utopia-php/cache/issues"
             },
-            "time": "2026-06-22T08:55:59+00:00"
+            "time": "2026-06-22T09:09:49+00:00"
         },
         {
             "name": "utopia-php/circuit-breaker",