symfony
diff --git a/‎src/Symfony/Component/Scheduler/Generator/Checkpoint.php
Lines changed: 3 additions & 6 deletions b/‎src/Symfony/Component/Scheduler/Generator/Checkpoint.php
Lines changed: 3 additions & 6 deletions
diff --git a/‎src/Symfony/Component/Scheduler/Tests/Generator/CheckpointTest.php
Lines changed: 24 additions & 0 deletions b/‎src/Symfony/Component/Scheduler/Tests/Generator/CheckpointTest.php
Lines changed: 24 additions & 0 deletions
@@ -31,20 +31,17 @@ public function __construct(
     public function acquire(\DateTimeImmutable $now): bool
     {
         if ($this->lock && !$this->lock->acquire()) {
-            // Reset local state if a Lock is acquired by another Worker.
             $this->reset = true;
 
             return false;
         }
 
-        if ($this->reset) {
-            $this->reset = false;
-            $this->save($now, -1);
-        }
-
         if ($this->cache) {
             [$this->time, $this->index, $this->from] = $this->cache->get($this->name, fn () => [$now, -1, $now]) + [2 => $now];
             $this->save($this->time, $this->index);
+        } elseif ($this->reset) {
+            $this->reset = false;
+            $this->save($now, -1);
         }
 
         $this->time ??= $now;
 
@@ -190,6 +190,30 @@ public function testWithLockResetStateAfterLockedAcquiring()
         $this->assertFalse($concurrentLock->isAcquired());
     }
 
+    public function testWithLockResetStateAfterLockedAcquiringCache()
+    {
+        $concurrentLock = new Lock(new Key('locked'), $store = new InMemoryStore(), autoRelease: false);
+        $concurrentLock->acquire();
+        $this->assertTrue($concurrentLock->isAcquired());
+
+        $lock = new Lock(new Key('locked'), $store, autoRelease: false);
+        $checkpoint = new Checkpoint('locked', $lock, $cache = new ArrayAdapter());
+        $now = new \DateTimeImmutable('2020-02-20 20:20:20Z');
+
+        $checkpoint->save($savedTime = $now->modify('-2 min'), $savedIndex = 0);
+        $checkpoint->acquire($now->modify('-1 min'));
+
+        $two = new Checkpoint('locked', $lock, $cache);
+
+        $concurrentLock->release();
+
+        $this->assertTrue($two->acquire($now));
+        $this->assertEquals($savedTime, $two->time());
+        $this->assertEquals($savedIndex, $two->index());
+        $this->assertTrue($lock->isAcquired());
+        $this->assertFalse($concurrentLock->isAcquired());
+    }
+
     public function testWithLockKeepLock()
     {
         $lock = new Lock(new Key('lock'), new InMemoryStore());