diff --git a/src/backend/base/langflow/services/cache/service.py b/src/backend/base/langflow/services/cache/service.py
index f917be6a57a0..8f55d8f0ee4c 100644
--- a/src/backend/base/langflow/services/cache/service.py
+++ b/src/backend/base/langflow/services/cache/service.py
@@ -298,10 +298,7 @@ def __init__(self, max_size=None, expiration_time=3600) -> None:
         self.expiration_time = expiration_time
 
     async def get(self, key, lock: asyncio.Lock | None = None):
-        if not lock:
-            async with self.lock:
-                return await self._get(key)
-        else:
+        async with lock or self.lock:
             return await self._get(key)
 
     async def _get(self, key):
@@ -315,13 +312,7 @@ async def _get(self, key):
         return CACHE_MISS
 
     async def set(self, key, value, lock: asyncio.Lock | None = None) -> None:
-        if not lock:
-            async with self.lock:
-                await self._set(
-                    key,
-                    value,
-                )
-        else:
+        async with lock or self.lock:
             await self._set(
                 key,
                 value,
@@ -334,10 +325,7 @@ async def _set(self, key, value) -> None:
         self.cache.move_to_end(key)
 
     async def delete(self, key, lock: asyncio.Lock | None = None) -> None:
-        if not lock:
-            async with self.lock:
-                await self._delete(key)
-        else:
+        async with lock or self.lock:
             await self._delete(key)
 
     async def _delete(self, key) -> None:
@@ -345,28 +333,21 @@ async def _delete(self, key) -> None:
             del self.cache[key]
 
     async def clear(self, lock: asyncio.Lock | None = None) -> None:
-        if not lock:
-            async with self.lock:
-                await self._clear()
-        else:
+        async with lock or self.lock:
             await self._clear()
 
     async def _clear(self) -> None:
         self.cache.clear()
 
     async def upsert(self, key, value, lock: asyncio.Lock | None = None) -> None:
-        if not lock:
-            async with self.lock:
-                await self._upsert(key, value)
-        else:
-            await self._upsert(key, value)
+        await self._upsert(key, value, lock)
 
-    async def _upsert(self, key, value) -> None:
-        existing_value = await self.get(key)
+    async def _upsert(self, key, value, lock: asyncio.Lock | None = None) -> None:
+        existing_value = await self.get(key, lock)
         if existing_value is not None and isinstance(existing_value, dict) and isinstance(value, dict):
             existing_value.update(value)
             value = existing_value
-        await self.set(key, value)
+        await self.set(key, value, lock)
 
     async def contains(self, key) -> bool:
         return key in self.cache