diff --git a/cache/classes/loaders.php b/cache/classes/loaders.php
index 5347ce8e21b..765ce0f3d91 100644
--- a/cache/classes/loaders.php
+++ b/cache/classes/loaders.php
@@ -621,7 +621,8 @@ class cache implements cache_loader {
         // store; parent method will have set it to all stores if needed.
         if ($setaftervalidation) {
             $lock = null;
-            if (!empty($this->requirelockingbeforewrite)) {
+            // Only try to acquire a lock for this cache if we do not already have one.
+            if (!empty($this->requirelockingbeforewrite) && !$this->check_lock_state($key)) {
                 $lock = $this->acquire_lock($key);
             }
             if ($requiredversion === self::VERSION_NONE) {