Merge remote-tracking branch 'origin/MC-35020' into 2.4-develop-pr30

Author: serhii-balko

lib/internal/Magento/Framework/Cache/Backend/RemoteSynchronizedCache.php

@@ -237,7 +237,7 @@ public function save($data, $id, $tags = [], $specificLifetime = false)
         $dataToSave = $data;
         $remHash = $this->loadRemoteDataVersion($id);
 
-        if ($remHash !== false) {
+        if ($remHash !== false && $this->getDataVersion($data) === $remHash) {
             $dataToSave = $this->remote->load($id);
         } else {
             $this->remote->save($data, $id, $tags, $specificLifetime);

lib/internal/Magento/Framework/Cache/Test/Unit/Backend/RemoteSynchronizedCacheTest.php

@@ -248,7 +248,7 @@ public function testClean()
         $this->remoteSyncCacheInstance->clean();
     }
 
-    public function testSaveWithRemoteData()
+    public function testSaveWithEqualRemoteData()
     {
         $remoteData = 1;
 
@@ -270,6 +270,21 @@ public function testSaveWithRemoteData()
         $this->remoteSyncCacheInstance->save($remoteData, 1);
     }
 
+    public function testSaveWithMismatchedRemoteData()
+    {
+        $remoteData = '1';
+
+        $this->remoteCacheMockExample
+            ->expects($this->at(0))
+            ->method('load')
+            ->willReturn(\hash('sha256', $remoteData));
+
+        $this->remoteCacheMockExample->expects($this->exactly(2))->method('save');
+        $this->localCacheMockExample->expects($this->once())->method('save');
+
+        $this->remoteSyncCacheInstance->save(2, 1);
+    }
+
     public function testSaveWithoutRemoteData()
     {
         $this->remoteCacheMockExample