remove reference caching (#658)

* remove reference caching

1 files changed, 84 insertions, 135 deletions

diff --git a/src/zenstore/cache/structuredcachestore.cpp b/src/zenstore/cache/structuredcachestore.cpp
index 49183600d..32a2a2aa3 100644
--- a/src/zenstore/cache/structuredcachestore.cpp
+++ b/src/zenstore/cache/structuredcachestore.cpp
@@ -882,17 +882,14 @@ namespace testutils {
 
 }  // namespace testutils
 
-TEST_CASE_TEMPLATE("z$.store", ReferenceCaching, testutils::FalseType, testutils::TrueType)
+TEST_CASE("z$.store")
 {
 	ScopedTemporaryDirectory TempDir;
 
 	GcManager Gc;
 
 	auto			  JobQueue = MakeJobQueue(1, "testqueue");
-	ZenCacheNamespace Zcs(Gc,
-						  *JobQueue,
-						  TempDir.Path() / "cache",
-						  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+	ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 
 	const int kIterationCount = 100;
 
@@ -926,7 +923,7 @@ TEST_CASE_TEMPLATE("z$.store", ReferenceCaching, testutils::FalseType, testutils
 	}
 }
 
-TEST_CASE_TEMPLATE("z$.size", ReferenceCaching, testutils::FalseType, testutils::TrueType)
+TEST_CASE("z$.size")
 {
 	auto JobQueue = MakeJobQueue(1, "testqueue");
 
@@ -948,10 +945,7 @@ TEST_CASE_TEMPLATE("z$.size", ReferenceCaching, testutils::FalseType, testutils:
 
 		{
 			GcManager		  Gc;
-			ZenCacheNamespace Zcs(Gc,
-								  *JobQueue,
-								  TempDir.Path() / "cache",
-								  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+			ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 
 			CbObject CacheValue = CreateCacheValue(Zcs.GetConfig().DiskLayerConfig.BucketConfig.MemCacheSizeThreshold - 256);
 
@@ -985,10 +979,7 @@ TEST_CASE_TEMPLATE("z$.size", ReferenceCaching, testutils::FalseType, testutils:
 
 		{
 			GcManager		  Gc;
-			ZenCacheNamespace Zcs(Gc,
-								  *JobQueue,
-								  TempDir.Path() / "cache",
-								  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+			ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 
 			const GcStorageSize SerializedSize = Zcs.StorageSize();
 			CHECK_EQ(SerializedSize.MemorySize, 0);
@@ -1012,10 +1003,7 @@ TEST_CASE_TEMPLATE("z$.size", ReferenceCaching, testutils::FalseType, testutils:
 
 		{
 			GcManager		  Gc;
-			ZenCacheNamespace Zcs(Gc,
-								  *JobQueue,
-								  TempDir.Path() / "cache",
-								  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+			ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 
 			CbObject CacheValue = CreateCacheValue(Zcs.GetConfig().DiskLayerConfig.BucketConfig.MemCacheSizeThreshold + 64);
 
@@ -1035,10 +1023,7 @@ TEST_CASE_TEMPLATE("z$.size", ReferenceCaching, testutils::FalseType, testutils:
 
 		{
 			GcManager		  Gc;
-			ZenCacheNamespace Zcs(Gc,
-								  *JobQueue,
-								  TempDir.Path() / "cache",
-								  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+			ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 
 			const GcStorageSize SerializedSize = Zcs.StorageSize();
 			CHECK_EQ(SerializedSize.MemorySize, 0);
@@ -1053,7 +1038,7 @@ TEST_CASE_TEMPLATE("z$.size", ReferenceCaching, testutils::FalseType, testutils:
 	}
 }
 
-TEST_CASE_TEMPLATE("z$.gc", ReferenceCaching, testutils::FalseType, testutils::TrueType)
+TEST_CASE("z$.gc")
 {
 	using namespace testutils;
 
@@ -1077,10 +1062,7 @@ TEST_CASE_TEMPLATE("z$.gc", ReferenceCaching, testutils::FalseType, testutils::T
 
 		{
 			GcManager		  Gc;
-			ZenCacheNamespace Zcs(Gc,
-								  *JobQueue,
-								  TempDir.Path() / "cache",
-								  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+			ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 			const auto		  Bucket = "teardrinker"sv;
 
 			// Create a cache record
@@ -1117,10 +1099,7 @@ TEST_CASE_TEMPLATE("z$.gc", ReferenceCaching, testutils::FalseType, testutils::T
 		// Expect timestamps to be serialized
 		{
 			GcManager			Gc;
-			ZenCacheNamespace	Zcs(Gc,
-									*JobQueue,
-									TempDir.Path() / "cache",
-									{.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+			ZenCacheNamespace	Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 			std::vector<IoHash> Keep;
 
 			// Collect garbage with 1 hour max cache duration
@@ -1141,10 +1120,7 @@ TEST_CASE_TEMPLATE("z$.gc", ReferenceCaching, testutils::FalseType, testutils::T
 	{
 		ScopedTemporaryDirectory TempDir;
 		GcManager				 Gc;
-		ZenCacheNamespace		 Zcs(Gc,
-								 *JobQueue,
-								 TempDir.Path() / "cache",
-								 {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+		ZenCacheNamespace		 Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 		const auto				 Bucket		 = "fortysixandtwo"sv;
 		const GcClock::TimePoint CurrentTime = GcClock::Now();
 
@@ -1190,10 +1166,7 @@ TEST_CASE_TEMPLATE("z$.gc", ReferenceCaching, testutils::FalseType, testutils::T
 		ScopedTemporaryDirectory TempDir;
 		GcManager				 Gc;
 		{
-			ZenCacheNamespace Zcs(Gc,
-								  *JobQueue,
-								  TempDir.Path() / "cache",
-								  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+			ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 			const auto		  Bucket = "rightintwo"sv;
 
 			std::vector<IoHash> Keys{CreateKey(1), CreateKey(2), CreateKey(3)};
@@ -1238,16 +1211,13 @@ TEST_CASE_TEMPLATE("z$.gc", ReferenceCaching, testutils::FalseType, testutils::T
 		}
 		{
 			// Unreferenced blocks will be pruned so size should now be zero
-			ZenCacheNamespace Zcs(Gc,
-								  *JobQueue,
-								  TempDir.Path() / "cache",
-								  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+			ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 			CHECK_EQ(0, Zcs.StorageSize().DiskSize);
 		}
 	}
 }
 
-TEST_CASE_TEMPLATE("z$.threadedinsert", ReferenceCaching, testutils::FalseType, testutils::TrueType)  // * doctest::skip(true))
+TEST_CASE_TEMPLATE("z$.threadedinsert", GCV2, testutils::FalseType, testutils::TrueType)  // * doctest::skip(true))
 {
 	//	for (uint32_t i = 0; i < 100; ++i)
 	{
@@ -1298,10 +1268,7 @@ TEST_CASE_TEMPLATE("z$.threadedinsert", ReferenceCaching, testutils::FalseType,
 		WorkerThreadPool  ThreadPool(4);
 		GcManager		  Gc;
 		auto			  JobQueue = MakeJobQueue(1, "testqueue");
-		ZenCacheNamespace Zcs(Gc,
-							  *JobQueue,
-							  TempDir.Path(),
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+		ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path(), {});
 
 		{
 			std::atomic<size_t> WorkCompleted = 0;
@@ -1318,6 +1285,41 @@ TEST_CASE_TEMPLATE("z$.threadedinsert", ReferenceCaching, testutils::FalseType,
 			}
 		}
 
+		auto DoGC = [](GcManager&												Gc,
+					   ZenCacheNamespace&										Zcs,
+					   std::unordered_map<IoHash, std::string, IoHash::Hasher>& GcChunkHashes,
+					   const std::vector<IoHash>&								KeepHashes) {
+			if (GCV2::Enabled)
+			{
+				GcSettings Settings = {.CacheExpireTime					  = GcClock::Now() - std::chrono::hours(24),
+									   .ProjectStoreExpireTime			  = GcClock::Now() - std::chrono::hours(24),
+									   .CollectSmallObjects				  = true,
+									   .IsDeleteMode					  = true,
+									   .CompactBlockUsageThresholdPercent = 100};
+				Gc.CollectGarbage(Settings);
+				// Cheating as we don't get the list of deleted hashes back from this call
+				std::unordered_map<IoHash, std::string, IoHash::Hasher> RemainingChunkHashes;
+				for (const auto& It : GcChunkHashes)
+				{
+					ZenCacheValue Tmp;
+					if (Zcs.Get(It.second, It.first, Tmp))
+					{
+						RemainingChunkHashes.insert(It);
+					}
+				}
+				GcChunkHashes.swap(RemainingChunkHashes);
+			}
+			else
+			{
+				GcContext GcCtx(GcClock::Now() - std::chrono::hours(24), GcClock::Now() - std::chrono::hours(24));
+				GcCtx.CollectSmallObjects(true);
+				GcCtx.AddRetainedCids(KeepHashes);
+				Zcs.CollectGarbage(GcCtx);
+				const HashKeySet& Deleted = GcCtx.DeletedCids();
+				Deleted.IterateHashes([&GcChunkHashes](const IoHash& ChunkHash) { GcChunkHashes.erase(ChunkHash); });
+			}
+		};
+
 		const uint64_t TotalSize = Zcs.StorageSize().DiskSize;
 		CHECK_LE(kChunkSize * Chunks.size(), TotalSize);
 
@@ -1422,12 +1424,7 @@ TEST_CASE_TEMPLATE("z$.threadedinsert", ReferenceCaching, testutils::FalseType,
 					C++;
 				}
 
-				GcContext GcCtx(GcClock::Now() - std::chrono::hours(24), GcClock::Now() - std::chrono::hours(24));
-				GcCtx.CollectSmallObjects(true);
-				GcCtx.AddRetainedCids(KeepHashes);
-				Zcs.CollectGarbage(GcCtx);
-				const HashKeySet& Deleted = GcCtx.DeletedCids();
-				Deleted.IterateHashes([&GcChunkHashes](const IoHash& ChunkHash) { GcChunkHashes.erase(ChunkHash); });
+				DoGC(Gc, Zcs, GcChunkHashes, KeepHashes);
 			}
 
 			while (WorkCompleted < NewChunks.size() + Chunks.size())
@@ -1470,28 +1467,25 @@ TEST_CASE_TEMPLATE("z$.threadedinsert", ReferenceCaching, testutils::FalseType,
 					C++;
 				}
 
-				GcContext GcCtx(GcClock::Now() - std::chrono::hours(24), GcClock::Now() - std::chrono::hours(24));
-				GcCtx.CollectSmallObjects(true);
-				GcCtx.AddRetainedCids(KeepHashes);
-				Zcs.CollectGarbage(GcCtx);
-				const HashKeySet& Deleted = GcCtx.DeletedCids();
-				Deleted.IterateHashes([&GcChunkHashes](const IoHash& ChunkHash) { GcChunkHashes.erase(ChunkHash); });
+				DoGC(Gc, Zcs, GcChunkHashes, KeepHashes);
 			}
 		}
 		{
-			std::atomic<size_t> WorkCompleted = 0;
-			for (const auto& Chunk : GcChunkHashes)
-			{
-				ThreadPool.ScheduleWork([&Zcs, &WorkCompleted, Chunk]() {
-					ZenCacheValue CacheValue;
-					CHECK(Zcs.Get(Chunk.second, Chunk.first, CacheValue));
-					CHECK(Chunk.first == IoHash::HashBuffer(CacheValue.Value));
-					WorkCompleted.fetch_add(1);
-				});
-			}
-			while (WorkCompleted < GcChunkHashes.size())
 			{
-				Sleep(1);
+				std::atomic<size_t> WorkCompleted = 0;
+				for (const auto& Chunk : GcChunkHashes)
+				{
+					ThreadPool.ScheduleWork([&Zcs, &WorkCompleted, Chunk]() {
+						ZenCacheValue CacheValue;
+						CHECK(Zcs.Get(Chunk.second, Chunk.first, CacheValue));
+						CHECK(Chunk.first == IoHash::HashBuffer(CacheValue.Value));
+						WorkCompleted.fetch_add(1);
+					});
+				}
+				while (WorkCompleted < GcChunkHashes.size())
+				{
+					Sleep(1);
+				}
 			}
 		}
 	}
@@ -1730,7 +1724,7 @@ TEST_CASE("z$.drop.namespace")
 	}
 }
 
-TEST_CASE_TEMPLATE("z$.blocked.disklayer.put", ReferenceCaching, testutils::FalseType, testutils::TrueType)
+TEST_CASE("z$.blocked.disklayer.put")
 {
 	ScopedTemporaryDirectory TempDir;
 
@@ -1747,10 +1741,7 @@ TEST_CASE_TEMPLATE("z$.blocked.disklayer.put", ReferenceCaching, testutils::Fals
 
 	GcManager		  Gc;
 	auto			  JobQueue = MakeJobQueue(1, "testqueue");
-	ZenCacheNamespace Zcs(Gc,
-						  *JobQueue,
-						  TempDir.Path() / "cache",
-						  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+	ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 
 	CbObject CacheValue = CreateCacheValue(64 * 1024 + 64);
 
@@ -1786,7 +1777,7 @@ TEST_CASE_TEMPLATE("z$.blocked.disklayer.put", ReferenceCaching, testutils::Fals
 	CHECK(memcmp(NewView.GetData(), Buffer2.GetData(), NewView.GetSize()) == 0);
 }
 
-TEST_CASE_TEMPLATE("z$.scrub", ReferenceCaching, testutils::FalseType, testutils::TrueType)
+TEST_CASE("z$.scrub")
 {
 	ScopedTemporaryDirectory TempDir;
 
@@ -1845,10 +1836,7 @@ TEST_CASE_TEMPLATE("z$.scrub", ReferenceCaching, testutils::FalseType, testutils
 	GcManager			  Gc;
 	CidStore			  CidStore(Gc);
 	auto				  JobQueue = MakeJobQueue(1, "testqueue");
-	ZenCacheNamespace	  Zcs(Gc,
-						  *JobQueue,
-						  TempDir.Path() / "cache",
-						  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+	ZenCacheNamespace	  Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 	CidStoreConfiguration CidConfig = {.RootDirectory = TempDir.Path() / "cas", .TinyValueThreshold = 1024, .HugeValueThreshold = 4096};
 	CidStore.Initialize(CidConfig);
 
@@ -1883,7 +1871,7 @@ TEST_CASE_TEMPLATE("z$.scrub", ReferenceCaching, testutils::FalseType, testutils
 	CHECK(ScrubCtx.BadCids().GetSize() == 0);
 }
 
-TEST_CASE_TEMPLATE("z$.newgc.basics", ReferenceCaching, testutils::FalseType, testutils::TrueType)
+TEST_CASE("z$.newgc.basics")
 {
 	using namespace testutils;
 
@@ -2000,10 +1988,7 @@ TEST_CASE_TEMPLATE("z$.newgc.basics", ReferenceCaching, testutils::FalseType, te
 		GcManager Gc;
 		CidStore  CidStore(Gc);
 		CidStore.Initialize({.RootDirectory = TempDir.Path() / "cas"});
-		ZenCacheNamespace Zcs(Gc,
-							  *JobQueue,
-							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+		ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 
 		// Create some basic data
 		{
@@ -2034,10 +2019,7 @@ TEST_CASE_TEMPLATE("z$.newgc.basics", ReferenceCaching, testutils::FalseType, te
 		GcManager Gc;
 		CidStore  CidStore(Gc);
 		CidStore.Initialize({.RootDirectory = TempDir.Path() / "cas"});
-		ZenCacheNamespace Zcs(Gc,
-							  *JobQueue,
-							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+		ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		GcResult Result = Gc.CollectGarbage(GcSettings{.CacheExpireTime		   = GcClock::Now() - std::chrono::hours(1),
@@ -2068,10 +2050,7 @@ TEST_CASE_TEMPLATE("z$.newgc.basics", ReferenceCaching, testutils::FalseType, te
 		GcManager Gc;
 		CidStore  CidStore(Gc);
 		CidStore.Initialize({.RootDirectory = TempDir.Path() / "cas"});
-		ZenCacheNamespace Zcs(Gc,
-							  *JobQueue,
-							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+		ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		GcResult Result = Gc.CollectGarbage(GcSettings{.CacheExpireTime		   = GcClock::Now() + std::chrono::hours(1),
@@ -2102,10 +2081,7 @@ TEST_CASE_TEMPLATE("z$.newgc.basics", ReferenceCaching, testutils::FalseType, te
 		GcManager Gc;
 		CidStore  CidStore(Gc);
 		CidStore.Initialize({.RootDirectory = TempDir.Path() / "cas"});
-		ZenCacheNamespace Zcs(Gc,
-							  *JobQueue,
-							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+		ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		GcResult Result = Gc.CollectGarbage(GcSettings{.CacheExpireTime		   = GcClock::Now() + std::chrono::hours(1),
@@ -2136,10 +2112,7 @@ TEST_CASE_TEMPLATE("z$.newgc.basics", ReferenceCaching, testutils::FalseType, te
 		GcManager Gc;
 		CidStore  CidStore(Gc);
 		CidStore.Initialize({.RootDirectory = TempDir.Path() / "cas"});
-		ZenCacheNamespace Zcs(Gc,
-							  *JobQueue,
-							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+		ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		GcResult Result = Gc.CollectGarbage(GcSettings{.CacheExpireTime		   = GcClock::Now() + std::chrono::hours(1),
@@ -2171,10 +2144,7 @@ TEST_CASE_TEMPLATE("z$.newgc.basics", ReferenceCaching, testutils::FalseType, te
 		GcManager Gc;
 		CidStore  CidStore(Gc);
 		CidStore.Initialize({.RootDirectory = TempDir.Path() / "cas"});
-		ZenCacheNamespace Zcs(Gc,
-							  *JobQueue,
-							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+		ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		GcResult Result = Gc.CollectGarbage(GcSettings{.CacheExpireTime		   = GcClock::Now() + std::chrono::hours(1),
@@ -2206,10 +2176,7 @@ TEST_CASE_TEMPLATE("z$.newgc.basics", ReferenceCaching, testutils::FalseType, te
 		GcManager Gc;
 		CidStore  CidStore(Gc);
 		CidStore.Initialize({.RootDirectory = TempDir.Path() / "cas"});
-		ZenCacheNamespace Zcs(Gc,
-							  *JobQueue,
-							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+		ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		GcResult Result = Gc.CollectGarbage(GcSettings{.CacheExpireTime		   = GcClock::Now() + std::chrono::hours(1),
@@ -2247,10 +2214,7 @@ TEST_CASE_TEMPLATE("z$.newgc.basics", ReferenceCaching, testutils::FalseType, te
 		GcManager Gc;
 		CidStore  CidStore(Gc);
 		CidStore.Initialize({.RootDirectory = TempDir.Path() / "cas"});
-		ZenCacheNamespace Zcs(Gc,
-							  *JobQueue,
-							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+		ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		GcResult Result = Gc.CollectGarbage(GcSettings{.CacheExpireTime		   = GcClock::Now() + std::chrono::hours(1),
@@ -2283,10 +2247,7 @@ TEST_CASE_TEMPLATE("z$.newgc.basics", ReferenceCaching, testutils::FalseType, te
 		GcManager Gc;
 		CidStore  CidStore(Gc);
 		CidStore.Initialize({.RootDirectory = TempDir.Path() / "cas"});
-		ZenCacheNamespace Zcs(Gc,
-							  *JobQueue,
-							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+		ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		Zcs.SetAccessTime(TearDrinkerBucket, CacheRecords[0], GcClock::Now() + std::chrono::hours(2));
@@ -2323,10 +2284,7 @@ TEST_CASE_TEMPLATE("z$.newgc.basics", ReferenceCaching, testutils::FalseType, te
 		GcManager Gc;
 		CidStore  CidStore(Gc);
 		CidStore.Initialize({.RootDirectory = TempDir.Path() / "cas"});
-		ZenCacheNamespace Zcs(Gc,
-							  *JobQueue,
-							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+		ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		Zcs.SetAccessTime(TearDrinkerBucket, CacheRecords[0], GcClock::Now() + std::chrono::hours(2));
@@ -2362,10 +2320,7 @@ TEST_CASE_TEMPLATE("z$.newgc.basics", ReferenceCaching, testutils::FalseType, te
 		GcManager Gc;
 		CidStore  CidStore(Gc);
 		CidStore.Initialize({.RootDirectory = TempDir.Path() / "cas"});
-		ZenCacheNamespace Zcs(Gc,
-							  *JobQueue,
-							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+		ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		Zcs.SetAccessTime(TearDrinkerBucket, UnstructuredCacheValues[1], GcClock::Now() + std::chrono::hours(2));
@@ -2402,10 +2357,7 @@ TEST_CASE_TEMPLATE("z$.newgc.basics", ReferenceCaching, testutils::FalseType, te
 		GcManager Gc;
 		CidStore  CidStore(Gc);
 		CidStore.Initialize({.RootDirectory = TempDir.Path() / "cas"});
-		ZenCacheNamespace Zcs(Gc,
-							  *JobQueue,
-							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+		ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		// Prime so we can check GC of memory layer
@@ -2455,10 +2407,7 @@ TEST_CASE_TEMPLATE("z$.newgc.basics", ReferenceCaching, testutils::FalseType, te
 		GcManager Gc;
 		CidStore  CidStore(Gc);
 		CidStore.Initialize({.RootDirectory = TempDir.Path() / "cas"});
-		ZenCacheNamespace Zcs(Gc,
-							  *JobQueue,
-							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
+		ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		auto Attachments =