diff --git a/src/GameCult.Caching.MessagePack/DirectoryMessagePackBackingStore.cs b/src/GameCult.Caching.MessagePack/DirectoryMessagePackBackingStore.cs
index 96ae21b9..88e1a1fc 100644
--- a/src/GameCult.Caching.MessagePack/DirectoryMessagePackBackingStore.cs
+++ b/src/GameCult.Caching.MessagePack/DirectoryMessagePackBackingStore.cs
@@ -341,6 +341,7 @@ public sealed class DirectoryMessagePackBackingStore : CacheBackingStore
             var pagePayload = CultDocumentMessagePackSerialization.SerializePersistedRecord(record);
             var indexRecord = ToContentAddressedIndexRecord(record, pagePayload);
             stored.StoredVersion = VersionOf(indexRecord.Payload);
+            stored.StoredSchemaId = stored.Descriptor.SchemaId;
             currentIndex[key] = indexRecord;
             WriteFileAtomically(
                 ContentAddressedRecordPath(indexRecord),
diff --git a/tests/GameCult.Caching.Tests/ConditionalCommitTests.cs b/tests/GameCult.Caching.Tests/ConditionalCommitTests.cs
index 59fcd764..9c61328b 100644
--- a/tests/GameCult.Caching.Tests/ConditionalCommitTests.cs
+++ b/tests/GameCult.Caching.Tests/ConditionalCommitTests.cs
@@ -90,7 +90,10 @@ namespace GameCult.Caching.Tests
             var observed = cache.Get(DriftKey)!;
             var storedAt = cache.GetStored(DriftKey)!.StoredAt;
             using (var other = Drift(false, ReusedDrift).Open())
+            {
+                other.BackingStores[0].Push(other.GetStored(DriftKey)!);
                 other.BackingStores[0].PushAll();
+            }
             using (var reader = Drift(false, ReusedDrift).Open())
                 Assert.That(reader.GetStored(DriftKey)!.StoredAt, Is.EqualTo(storedAt), "the rewrite kept storedAt");
 
diff --git a/tests/GameCult.Caching.Tests/VariantTests.cs b/tests/GameCult.Caching.Tests/VariantTests.cs
index 7ad14cf7..62685162 100644
--- a/tests/GameCult.Caching.Tests/VariantTests.cs
+++ b/tests/GameCult.Caching.Tests/VariantTests.cs
@@ -1256,7 +1256,7 @@ namespace GameCult.Caching.Tests
                 using (var w = Open(path))
                     Assert.That(w.Commit(batch => batch.Upsert(typeof(VariantGear), Named("x", "l1"), BaseKey)), Is.True);
 
-                var refused = Refused(() => a.Commit(batch =>
+                var refused = Assert.Throws<CultWriteConflictException>(() => a.Commit(batch =>
                 {
                     batch.Expect(other, a.Get(other));
                     batch.UpsertVariant(BigKey, BaseKey, new[]
@@ -1264,7 +1264,7 @@ namespace GameCult.Caching.Tests
                         a.Override<VariantGear>(nameof(VariantGear.Name), "x"),
                         a.Override<VariantGear>(nameof(VariantGear.Code), "big")
                     });
-                }));
+                }))!;
                 Assert.That(refused.Message, Does.Contain(BigKey.Value).And.Contain(BaseKey.Value).And.Contain("x"));
             }