Merge branch 'main' of https://github.com/EpicGames/zen

25 files changed, 4259 insertions, 2117 deletions

diff --git a/src/zenserver/admin/admin.cpp b/src/zenserver/admin/admin.cpp
index d4c69f41b..c2df847ad 100644
--- a/src/zenserver/admin/admin.cpp
+++ b/src/zenserver/admin/admin.cpp
@@ -204,25 +204,24 @@ HttpAdminService::HttpAdminService(GcScheduler&	   Scheduler,
 				Details = true;
 			}
 
-			auto SecondsToString = [](std::chrono::seconds Secs) {
-				return NiceTimeSpanMs(uint64_t(std::chrono::milliseconds(Secs).count()));
-			};
-
 			CbObjectWriter Response;
 			Response << "Status"sv << (GcSchedulerStatus::kIdle == State.Status ? "Idle"sv : "Running"sv);
 			Response.BeginObject("Config");
 			{
 				Response << "RootDirectory" << State.Config.RootDirectory.string();
-				Response << "MonitorInterval" << SecondsToString(State.Config.MonitorInterval);
-				Response << "Interval" << SecondsToString(State.Config.Interval);
-				Response << "MaxCacheDuration" << SecondsToString(State.Config.MaxCacheDuration);
-				Response << "MaxProjectStoreDuration" << SecondsToString(State.Config.MaxProjectStoreDuration);
+				Response << "MonitorInterval" << ToTimeSpan(State.Config.MonitorInterval);
+				Response << "Interval" << ToTimeSpan(State.Config.Interval);
+				Response << "MaxCacheDuration" << ToTimeSpan(State.Config.MaxCacheDuration);
+				Response << "MaxProjectStoreDuration" << ToTimeSpan(State.Config.MaxProjectStoreDuration);
 				Response << "CollectSmallObjects" << State.Config.CollectSmallObjects;
 				Response << "Enabled" << State.Config.Enabled;
 				Response << "DiskReserveSize" << NiceBytes(State.Config.DiskReserveSize);
 				Response << "DiskSizeSoftLimit" << NiceBytes(State.Config.DiskSizeSoftLimit);
 				Response << "MinimumFreeDiskSpaceToAllowWrites" << NiceBytes(State.Config.MinimumFreeDiskSpaceToAllowWrites);
-				Response << "LightweightInterval" << SecondsToString(State.Config.LightweightInterval);
+				Response << "LightweightInterval" << ToTimeSpan(State.Config.LightweightInterval);
+				Response << "UseGCVersion" << ((State.Config.UseGCVersion == GcVersion::kV1) ? "1" : "2");
+				Response << "CompactBlockUsageThresholdPercent" << State.Config.CompactBlockUsageThresholdPercent;
+				Response << "Verbose" << State.Config.Verbose;
 			}
 			Response.EndObject();
 			Response << "AreDiskWritesBlocked" << State.AreDiskWritesBlocked;
@@ -233,8 +232,8 @@ HttpAdminService::HttpAdminService(GcScheduler&	   Scheduler,
 
 			Response.BeginObject("FullGC");
 			{
-				Response << "LastTime" << fmt::format("{}", State.LastFullGcTime);
-				Response << "TimeToNext" << SecondsToString(State.RemainingTimeUntilFullGc);
+				Response << "LastTime" << ToDateTime(State.LastFullGcTime);
+				Response << "TimeToNext" << ToTimeSpan(State.RemainingTimeUntilFullGc);
 				if (State.Config.DiskSizeSoftLimit != 0)
 				{
 					Response << "SpaceToNext" << NiceBytes(State.RemainingSpaceUntilFullGC);
@@ -246,7 +245,7 @@ HttpAdminService::HttpAdminService(GcScheduler&	   Scheduler,
 				}
 				else
 				{
-					Response << "LastDuration" << NiceTimeSpanMs(State.LastFullGcDuration.count());
+					Response << "LastDuration" << ToTimeSpan(State.LastFullGcDuration);
 					Response << "LastDiskFreed" << NiceBytes(State.LastFullGCDiff.DiskSize);
 					Response << "LastMemoryFreed" << NiceBytes(State.LastFullGCDiff.MemorySize);
 				}
@@ -254,8 +253,8 @@ HttpAdminService::HttpAdminService(GcScheduler&	   Scheduler,
 			Response.EndObject();
 			Response.BeginObject("LightweightGC");
 			{
-				Response << "LastTime" << fmt::format("{}", State.LastLightweightGcTime);
-				Response << "TimeToNext" << SecondsToString(State.RemainingTimeUntilLightweightGc);
+				Response << "LastTime" << ToDateTime(State.LastLightweightGcTime);
+				Response << "TimeToNext" << ToTimeSpan(State.RemainingTimeUntilLightweightGc);
 
 				if (State.LastLightweightGCV2Result)
 				{
@@ -264,7 +263,7 @@ HttpAdminService::HttpAdminService(GcScheduler&	   Scheduler,
 				}
 				else
 				{
-					Response << "LastDuration" << NiceTimeSpanMs(State.LastLightweightGcDuration.count());
+					Response << "LastDuration" << ToTimeSpan(State.LastLightweightGcDuration);
 					Response << "LastDiskFreed" << NiceBytes(State.LastLightweightGCDiff.DiskSize);
 					Response << "LastMemoryFreed" << NiceBytes(State.LastLightweightGCDiff.MemorySize);
 				}
@@ -330,11 +329,36 @@ HttpAdminService::HttpAdminService(GcScheduler&	   Scheduler,
 				GcParams.ForceGCVersion = GcVersion::kV2;
 			}
 
+			if (auto Param = Params.GetValue("compactblockthreshold"); Param.empty() == false)
+			{
+				if (auto Value = ParseInt<uint32_t>(Param))
+				{
+					GcParams.CompactBlockUsageThresholdPercent = Value.value();
+				}
+			}
+
+			if (auto Param = Params.GetValue("verbose"); Param.empty() == false)
+			{
+				GcParams.Verbose = Param == "true"sv;
+			}
+
 			const bool Started = m_GcScheduler.TriggerGc(GcParams);
 
 			CbObjectWriter Response;
 			Response << "Status"sv << (Started ? "Started"sv : "Running"sv);
-			HttpReq.WriteResponse(HttpResponseCode::OK, Response.Save());
+			HttpReq.WriteResponse(HttpResponseCode::Accepted, Response.Save());
+		},
+		HttpVerb::kPost);
+
+	m_Router.RegisterRoute(
+		"gc-stop",
+		[this](HttpRouterRequest& Req) {
+			HttpServerRequest& HttpReq = Req.ServerRequest();
+			if (m_GcScheduler.CancelGC())
+			{
+				return HttpReq.WriteResponse(HttpResponseCode::Accepted);
+			}
+			HttpReq.WriteResponse(HttpResponseCode::OK);
 		},
 		HttpVerb::kPost);
 
@@ -381,10 +405,30 @@ HttpAdminService::HttpAdminService(GcScheduler&	   Scheduler,
 
 			GcScheduler::TriggerScrubParams ScrubParams;
 			ScrubParams.MaxTimeslice = std::chrono::seconds(100);
+
+			if (auto Param = Params.GetValue("skipdelete"); Param.empty() == false)
+			{
+				ScrubParams.SkipDelete = (Param == "true"sv);
+			}
+
+			if (auto Param = Params.GetValue("skipgc"); Param.empty() == false)
+			{
+				ScrubParams.SkipGc = (Param == "true"sv);
+			}
+
+			if (auto Param = Params.GetValue("skipcid"); Param.empty() == false)
+			{
+				ScrubParams.SkipCas = (Param == "true"sv);
+			}
+
 			m_GcScheduler.TriggerScrub(ScrubParams);
 
 			CbObjectWriter Response;
 			Response << "ok"sv << true;
+			Response << "skip_delete" << ScrubParams.SkipDelete;
+			Response << "skip_gc" << ScrubParams.SkipGc;
+			Response << "skip_cas" << ScrubParams.SkipCas;
+			Response << "max_time" << TimeSpan(0, 0, gsl::narrow<int>(ScrubParams.MaxTimeslice.count()));
 			HttpReq.WriteResponse(HttpResponseCode::OK, Response.Save());
 		},
 		HttpVerb::kPost);
@@ -438,7 +482,7 @@ HttpAdminService::HttpAdminService(GcScheduler&	   Scheduler,
 														 HttpContentType::kText,
 														 "Tracing is already enabled"sv);
 			}
-			TraceStart(HostOrPath.c_str(), Type);
+			TraceStart("zenserver", HostOrPath.c_str(), Type);
 			return Req.ServerRequest().WriteResponse(HttpResponseCode::OK, HttpContentType::kText, "Tracing started");
 		},
 		HttpVerb::kPost);
diff --git a/src/zenserver/cache/cachedisklayer.cpp b/src/zenserver/cache/cachedisklayer.cpp
index 9bb75480e..0987cd0f1 100644
--- a/src/zenserver/cache/cachedisklayer.cpp
+++ b/src/zenserver/cache/cachedisklayer.cpp
@@ -14,6 +14,7 @@
 #include <zencore/trace.h>
 #include <zencore/workthreadpool.h>
 #include <zencore/xxhash.h>
+#include <zenutil/workerpools.h>
 
 #include <future>
 
@@ -25,12 +26,6 @@ namespace {
 #pragma pack(push)
 #pragma pack(1)
 
-	// We use this to indicate if a on disk bucket needs wiping
-	// In version 0.2.5 -> 0.2.11 there was a GC corruption bug that would scrable the references
-	// to block items.
-	// See: https://github.com/EpicGames/zen/pull/299
-	static const uint32_t CurrentDiskBucketVersion = 1;
-
 	struct CacheBucketIndexHeader
 	{
 		static constexpr uint32_t ExpectedMagic	 = 0x75696478;	// 'uidx';
@@ -48,23 +43,94 @@ namespace {
 		{
 			return XXH32(&Header.Magic, sizeof(CacheBucketIndexHeader) - sizeof(uint32_t), 0xC0C0'BABA);
 		}
+
+		bool IsValid() const
+		{
+			if (Magic != ExpectedMagic)
+			{
+				return false;
+			}
+
+			if (Checksum != ComputeChecksum(*this))
+			{
+				return false;
+			}
+
+			if (PayloadAlignment == 0)
+			{
+				return false;
+			}
+
+			return true;
+		}
 	};
 
 	static_assert(sizeof(CacheBucketIndexHeader) == 32);
 
+	struct BucketMetaHeader
+	{
+		static constexpr uint32_t ExpectedMagic	 = 0x61'74'65'6d;  // 'meta';
+		static constexpr uint32_t Version1		 = 1;
+		static constexpr uint32_t CurrentVersion = Version1;
+
+		uint32_t Magic		 = ExpectedMagic;
+		uint32_t Version	 = CurrentVersion;
+		uint64_t EntryCount	 = 0;
+		uint64_t LogPosition = 0;
+		uint32_t Padding	 = 0;
+		uint32_t Checksum	 = 0;
+
+		static uint32_t ComputeChecksum(const BucketMetaHeader& Header)
+		{
+			return XXH32(&Header.Magic, sizeof(BucketMetaHeader) - sizeof(uint32_t), 0xC0C0'BABA);
+		}
+
+		bool IsValid() const
+		{
+			if (Magic != ExpectedMagic)
+			{
+				return false;
+			}
+
+			if (Checksum != ComputeChecksum(*this))
+			{
+				return false;
+			}
+
+			if (Padding != 0)
+			{
+				return false;
+			}
+
+			return true;
+		}
+	};
+
+	static_assert(sizeof(BucketMetaHeader) == 32);
+
 #pragma pack(pop)
 
+	//////////////////////////////////////////////////////////////////////////
+
+	template<typename T>
+	void Reset(T& V)
+	{
+		T Tmp;
+		V.swap(Tmp);
+	}
+
 	const char* IndexExtension = ".uidx";
 	const char* LogExtension   = ".slog";
+	const char* MetaExtension  = ".meta";
 
 	std::filesystem::path GetIndexPath(const std::filesystem::path& BucketDir, const std::string& BucketName)
 	{
 		return BucketDir / (BucketName + IndexExtension);
 	}
 
-	std::filesystem::path GetTempIndexPath(const std::filesystem::path& BucketDir, const std::string& BucketName)
+	std::filesystem::path GetMetaPath(const std::filesystem::path& BucketDir, const std::string& BucketName)
 	{
-		return BucketDir / (BucketName + ".tmp");
+		return BucketDir / (BucketName + MetaExtension);
 	}
 
 	std::filesystem::path GetLogPath(const std::filesystem::path& BucketDir, const std::string& BucketName)
@@ -72,6 +138,12 @@ namespace {
 		return BucketDir / (BucketName + LogExtension);
 	}
 
+	std::filesystem::path GetManifestPath(const std::filesystem::path& BucketDir, const std::string& BucketName)
+	{
+		ZEN_UNUSED(BucketName);
+		return BucketDir / "zen_manifest";
+	}
+
 	bool ValidateCacheBucketIndexEntry(const DiskIndexEntry& Entry, std::string& OutReason)
 	{
 		if (Entry.Key == IoHash::Zero)
@@ -140,26 +212,458 @@ namespace {
 }  // namespace
 
 namespace fs = std::filesystem;
+using namespace std::literals;
 
-static CbObject
-LoadCompactBinaryObject(const fs::path& Path)
+class BucketManifestSerializer
 {
-	FileContents Result = ReadFile(Path);
+	using MetaDataIndex	 = ZenCacheDiskLayer::CacheBucket::MetaDataIndex;
+	using BucketMetaData = ZenCacheDiskLayer::CacheBucket::BucketMetaData;
+
+	using PayloadIndex	= ZenCacheDiskLayer::CacheBucket::PayloadIndex;
+	using BucketPayload = ZenCacheDiskLayer::CacheBucket::BucketPayload;
+
+public:
+	// We use this to indicate if a on disk bucket needs wiping
+	// In version 0.2.5 -> 0.2.11 there was a GC corruption bug that would scramble the references
+	// to block items.
+	// See: https://github.com/EpicGames/zen/pull/299
+	static inline const uint32_t CurrentDiskBucketVersion = 1;
 
-	if (!Result.ErrorCode)
+	bool Open(std::filesystem::path ManifestPath)
 	{
-		IoBuffer Buffer = Result.Flatten();
-		if (CbValidateError Error = ValidateCompactBinary(Buffer, CbValidateMode::All); Error == CbValidateError::None)
+		Manifest = LoadCompactBinaryObject(ManifestPath);
+		return !!Manifest;
+	}
+
+	Oid GetBucketId() const { return Manifest["BucketId"sv].AsObjectId(); }
+
+	bool IsCurrentVersion(uint32_t& OutVersion) const
+	{
+		OutVersion = Manifest["Version"sv].AsUInt32(0);
+		return OutVersion == CurrentDiskBucketVersion;
+	}
+
+	void ParseManifest(RwLock::ExclusiveLockScope&								   BucketLock,
+					   ZenCacheDiskLayer::CacheBucket&							   Bucket,
+					   std::filesystem::path									   ManifestPath,
+					   ZenCacheDiskLayer::CacheBucket::IndexMap&				   Index,
+					   std::vector<AccessTime>&									   AccessTimes,
+					   std::vector<ZenCacheDiskLayer::CacheBucket::BucketPayload>& Payloads);
+
+	Oid GenerateNewManifest(std::filesystem::path ManifestPath);
+
+	IoBuffer MakeSidecarManifest(const Oid& BucketId, uint64_t EntryCount);
+	uint64_t GetSidecarSize() const { return m_ManifestEntryCount * sizeof(ManifestData); }
+	void	 WriteSidecarFile(RwLock::SharedLockScope&											 BucketLock,
+							  const std::filesystem::path&										 SidecarPath,
+							  uint64_t															 SnapshotLogPosition,
+							  const ZenCacheDiskLayer::CacheBucket::IndexMap&					 Index,
+							  const std::vector<AccessTime>&									 AccessTimes,
+							  const std::vector<ZenCacheDiskLayer::CacheBucket::BucketPayload>&	 Payloads,
+							  const std::vector<ZenCacheDiskLayer::CacheBucket::BucketMetaData>& MetaDatas);
+	bool	 ReadSidecarFile(RwLock::ExclusiveLockScope&								 BucketLock,
+							 ZenCacheDiskLayer::CacheBucket&							 Bucket,
+							 std::filesystem::path										 SidecarPath,
+							 ZenCacheDiskLayer::CacheBucket::IndexMap&					 Index,
+							 std::vector<AccessTime>&									 AccessTimes,
+							 std::vector<ZenCacheDiskLayer::CacheBucket::BucketPayload>& Payloads);
+
+	IoBuffer MakeManifest(const Oid&													BucketId,
+						  ZenCacheDiskLayer::CacheBucket::IndexMap&&					Index,
+						  std::vector<AccessTime>&&										AccessTimes,
+						  std::vector<ZenCacheDiskLayer::CacheBucket::BucketPayload>&&	Payloads,
+						  std::vector<ZenCacheDiskLayer::CacheBucket::BucketMetaData>&& MetaDatas);
+
+	CbObject Manifest;
+
+private:
+	CbObject LoadCompactBinaryObject(const fs::path& Path)
+	{
+		FileContents Result = ReadFile(Path);
+
+		if (!Result.ErrorCode)
 		{
-			return LoadCompactBinaryObject(Buffer);
+			IoBuffer Buffer = Result.Flatten();
+			if (CbValidateError Error = ValidateCompactBinary(Buffer, CbValidateMode::All); Error == CbValidateError::None)
+			{
+				return zen::LoadCompactBinaryObject(Buffer);
+			}
 		}
+
+		return CbObject();
 	}
 
-	return CbObject();
+	uint64_t m_ManifestEntryCount = 0;
+
+	struct ManifestData
+	{
+		IoHash	   Key;		   // 20
+		AccessTime Timestamp;  // 4
+		IoHash	   RawHash;	   // 20
+		uint32_t   Padding_0;  // 4
+		size_t	   RawSize;	   // 8
+		uint64_t   Padding_1;  // 8
+	};
+
+	static_assert(sizeof(ManifestData) == 64);
+};
+
+void
+BucketManifestSerializer::ParseManifest(RwLock::ExclusiveLockScope&									BucketLock,
+										ZenCacheDiskLayer::CacheBucket&								Bucket,
+										std::filesystem::path										ManifestPath,
+										ZenCacheDiskLayer::CacheBucket::IndexMap&					Index,
+										std::vector<AccessTime>&									AccessTimes,
+										std::vector<ZenCacheDiskLayer::CacheBucket::BucketPayload>& Payloads)
+{
+	if (Manifest["UsingMetaFile"sv].AsBool())
+	{
+		ReadSidecarFile(BucketLock, Bucket, GetMetaPath(Bucket.m_BucketDir, Bucket.m_BucketName), Index, AccessTimes, Payloads);
+
+		return;
+	}
+
+	ZEN_TRACE_CPU("Z$::ParseManifest");
+
+	Stopwatch  Timer;
+	const auto _ = MakeGuard([&] { ZEN_INFO("parsed store manifest '{}' in {}", ManifestPath, NiceTimeSpanMs(Timer.GetElapsedTimeMs())); });
+
+	const uint64_t			  Count = Manifest["Count"sv].AsUInt64(0);
+	std::vector<PayloadIndex> KeysIndexes;
+	KeysIndexes.reserve(Count);
+
+	CbArrayView KeyArray = Manifest["Keys"sv].AsArrayView();
+	for (CbFieldView& KeyView : KeyArray)
+	{
+		if (auto It = Index.find(KeyView.AsHash()); It != Index.end())
+		{
+			KeysIndexes.push_back(It.value());
+		}
+		else
+		{
+			KeysIndexes.push_back(PayloadIndex());
+		}
+	}
+
+	size_t		KeyIndexOffset = 0;
+	CbArrayView TimeStampArray = Manifest["Timestamps"].AsArrayView();
+	for (CbFieldView& TimeStampView : TimeStampArray)
+	{
+		const PayloadIndex KeyIndex = KeysIndexes[KeyIndexOffset++];
+		if (KeyIndex)
+		{
+			AccessTimes[KeyIndex] = TimeStampView.AsInt64();
+		}
+	}
+
+	KeyIndexOffset			 = 0;
+	CbArrayView RawHashArray = Manifest["RawHash"].AsArrayView();
+	CbArrayView RawSizeArray = Manifest["RawSize"].AsArrayView();
+	if (RawHashArray.Num() == RawSizeArray.Num())
+	{
+		auto RawHashIt = RawHashArray.CreateViewIterator();
+		auto RawSizeIt = RawSizeArray.CreateViewIterator();
+		while (RawHashIt != CbFieldViewIterator())
+		{
+			const PayloadIndex KeyIndex = KeysIndexes[KeyIndexOffset++];
+
+			if (KeyIndex)
+			{
+				uint64_t RawSize = RawSizeIt.AsUInt64();
+				IoHash	 RawHash = RawHashIt.AsHash();
+				if (RawSize != 0 || RawHash != IoHash::Zero)
+				{
+					BucketPayload& Payload = Payloads[KeyIndex];
+					Bucket.SetMetaData(BucketLock, Payload, BucketMetaData{.RawSize = RawSize, .RawHash = RawHash});
+				}
+			}
+
+			RawHashIt++;
+			RawSizeIt++;
+		}
+	}
+	else
+	{
+		ZEN_WARN("Mismatch in size between 'RawHash' and 'RawSize' arrays in {}, skipping meta data", ManifestPath);
+	}
+}
+
+Oid
+BucketManifestSerializer::GenerateNewManifest(std::filesystem::path ManifestPath)
+{
+	const Oid BucketId = Oid::NewOid();
+
+	CbObjectWriter Writer;
+	Writer << "BucketId"sv << BucketId;
+	Writer << "Version"sv << CurrentDiskBucketVersion;
+	Manifest = Writer.Save();
+	WriteFile(ManifestPath, Manifest.GetBuffer().AsIoBuffer());
+
+	return BucketId;
+}
+
+IoBuffer
+BucketManifestSerializer::MakeManifest(const Oid&													 BucketId,
+									   ZenCacheDiskLayer::CacheBucket::IndexMap&&					 Index,
+									   std::vector<AccessTime>&&									 AccessTimes,
+									   std::vector<ZenCacheDiskLayer::CacheBucket::BucketPayload>&&	 Payloads,
+									   std::vector<ZenCacheDiskLayer::CacheBucket::BucketMetaData>&& MetaDatas)
+{
+	using namespace std::literals;
+
+	ZEN_TRACE_CPU("Z$::MakeManifest");
+
+	size_t ItemCount = Index.size();
+
+	// This tends to overestimate a little bit but it is still way more accurate than what we get with exponential growth
+	// And we don't need to reallocate the underlying buffer in almost every case
+	const size_t   EstimatedSizePerItem = 54u;
+	const size_t   ReserveSize			= ItemCount == 0 ? 48u : RoundUp(32u + (ItemCount * EstimatedSizePerItem), 128);
+	CbObjectWriter Writer(ReserveSize);
+
+	Writer << "BucketId"sv << BucketId;
+	Writer << "Version"sv << CurrentDiskBucketVersion;
+
+	if (!Index.empty())
+	{
+		Writer.AddInteger("Count"sv, gsl::narrow<std::uint64_t>(Index.size()));
+		Writer.BeginArray("Keys"sv);
+		for (auto& Kv : Index)
+		{
+			const IoHash& Key = Kv.first;
+			Writer.AddHash(Key);
+		}
+		Writer.EndArray();
+
+		Writer.BeginArray("Timestamps"sv);
+		for (auto& Kv : Index)
+		{
+			GcClock::Tick AccessTime = AccessTimes[Kv.second];
+			Writer.AddInteger(AccessTime);
+		}
+		Writer.EndArray();
+
+		if (!MetaDatas.empty())
+		{
+			Writer.BeginArray("RawHash"sv);
+			for (auto& Kv : Index)
+			{
+				const ZenCacheDiskLayer::CacheBucket::BucketPayload& Payload = Payloads[Kv.second];
+				if (Payload.MetaData)
+				{
+					Writer.AddHash(MetaDatas[Payload.MetaData].RawHash);
+				}
+				else
+				{
+					Writer.AddHash(IoHash::Zero);
+				}
+			}
+			Writer.EndArray();
+
+			Writer.BeginArray("RawSize"sv);
+			for (auto& Kv : Index)
+			{
+				const ZenCacheDiskLayer::CacheBucket::BucketPayload& Payload = Payloads[Kv.second];
+				if (Payload.MetaData)
+				{
+					Writer.AddInteger(MetaDatas[Payload.MetaData].RawSize);
+				}
+				else
+				{
+					Writer.AddInteger(0);
+				}
+			}
+			Writer.EndArray();
+		}
+	}
+
+	Manifest = Writer.Save();
+	return Manifest.GetBuffer().AsIoBuffer();
+}
+
+IoBuffer
+BucketManifestSerializer::MakeSidecarManifest(const Oid& BucketId, uint64_t EntryCount)
+{
+	m_ManifestEntryCount = EntryCount;
+
+	CbObjectWriter Writer;
+	Writer << "BucketId"sv << BucketId;
+	Writer << "Version"sv << CurrentDiskBucketVersion;
+	Writer << "Count"sv << EntryCount;
+	Writer << "UsingMetaFile"sv << true;
+	Manifest = Writer.Save();
+
+	return Manifest.GetBuffer().AsIoBuffer();
+}
+
+bool
+BucketManifestSerializer::ReadSidecarFile(RwLock::ExclusiveLockScope&								  BucketLock,
+										  ZenCacheDiskLayer::CacheBucket&							  Bucket,
+										  std::filesystem::path										  SidecarPath,
+										  ZenCacheDiskLayer::CacheBucket::IndexMap&					  Index,
+										  std::vector<AccessTime>&									  AccessTimes,
+										  std::vector<ZenCacheDiskLayer::CacheBucket::BucketPayload>& Payloads)
+{
+	ZEN_ASSERT(AccessTimes.size() == Payloads.size());
+
+	std::error_code Ec;
+
+	BasicFile SidecarFile;
+	SidecarFile.Open(SidecarPath, BasicFile::Mode::kRead, Ec);
+
+	if (Ec)
+	{
+		throw std::system_error(Ec, fmt::format("failed to open sidecar file '{}'", SidecarPath));
+	}
+
+	uint64_t FileSize = SidecarFile.FileSize();
+
+	auto InvalidGuard = MakeGuard([&] { ZEN_WARN("skipping invalid sidecar file '{}'", SidecarPath); });
+
+	if (FileSize < sizeof(BucketMetaHeader))
+	{
+		return false;
+	}
+
+	BasicFileBuffer Sidecar(SidecarFile, 128 * 1024);
+
+	BucketMetaHeader Header;
+	Sidecar.Read(&Header, sizeof Header, 0);
+
+	if (!Header.IsValid())
+	{
+		return false;
+	}
+
+	if (Header.Version != BucketMetaHeader::Version1)
+	{
+		return false;
+	}
+
+	const uint64_t ExpectedEntryCount = (FileSize - sizeof(sizeof(BucketMetaHeader))) / sizeof(ManifestData);
+	if (Header.EntryCount > ExpectedEntryCount)
+	{
+		return false;
+	}
+
+	InvalidGuard.Dismiss();
+
+	uint64_t RemainingEntryCount = ExpectedEntryCount;
+	uint64_t EntryCount			 = 0;
+	uint64_t CurrentReadOffset	 = sizeof(Header);
+
+	while (RemainingEntryCount--)
+	{
+		const ManifestData* Entry = Sidecar.MakeView<ManifestData>(CurrentReadOffset);
+		CurrentReadOffset += sizeof(ManifestData);
+
+		if (auto It = Index.find(Entry->Key); It != Index.end())
+		{
+			PayloadIndex PlIndex = It.value();
+
+			ZEN_ASSERT(size_t(PlIndex) <= Payloads.size());
+
+			ZenCacheDiskLayer::CacheBucket::BucketPayload& PayloadEntry = Payloads[PlIndex];
+
+			AccessTimes[PlIndex] = Entry->Timestamp;
+
+			if (Entry->RawSize && Entry->RawHash != IoHash::Zero)
+			{
+				Bucket.SetMetaData(BucketLock, PayloadEntry, BucketMetaData{.RawSize = Entry->RawSize, .RawHash = Entry->RawHash});
+			}
+		}
+
+		EntryCount++;
+	}
+
+	ZEN_ASSERT(EntryCount == ExpectedEntryCount);
+
+	return true;
+}
+
+void
+BucketManifestSerializer::WriteSidecarFile(RwLock::SharedLockScope&,
+										   const std::filesystem::path&										  SidecarPath,
+										   uint64_t															  SnapshotLogPosition,
+										   const ZenCacheDiskLayer::CacheBucket::IndexMap&					  Index,
+										   const std::vector<AccessTime>&									  AccessTimes,
+										   const std::vector<ZenCacheDiskLayer::CacheBucket::BucketPayload>&  Payloads,
+										   const std::vector<ZenCacheDiskLayer::CacheBucket::BucketMetaData>& MetaDatas)
+{
+	BucketMetaHeader Header;
+	Header.EntryCount  = m_ManifestEntryCount;
+	Header.LogPosition = SnapshotLogPosition;
+	Header.Checksum	   = Header.ComputeChecksum(Header);
+
+	std::error_code Ec;
+
+	TemporaryFile SidecarFile;
+	SidecarFile.CreateTemporary(SidecarPath.parent_path(), Ec);
+
+	if (Ec)
+	{
+		throw std::system_error(Ec, fmt::format("failed creating '{}'", SidecarFile.GetPath()));
+	}
+
+	SidecarFile.Write(&Header, sizeof Header, 0);
+
+	// TODO: make this batching for better performance
+	{
+		uint64_t WriteOffset = sizeof Header;
+
+		//		BasicFileWriter SidecarWriter(SidecarFile, 128 * 1024);
+
+		std::vector<ManifestData> ManifestDataBuffer;
+		const size_t			  MaxManifestDataBufferCount = Min(Index.size(), 4096u);  // 256 Kb
+		ManifestDataBuffer.reserve(MaxManifestDataBufferCount);
+		for (auto& Kv : Index)
+		{
+			const IoHash&	   Key	   = Kv.first;
+			const PayloadIndex PlIndex = Kv.second;
+
+			IoHash	 RawHash = IoHash::Zero;
+			uint64_t RawSize = 0;
+
+			if (const MetaDataIndex MetaIndex = Payloads[PlIndex].MetaData)
+			{
+				RawHash = MetaDatas[MetaIndex].RawHash;
+				RawSize = MetaDatas[MetaIndex].RawSize;
+			}
+
+			ManifestDataBuffer.emplace_back(ManifestData{.Key		= Key,
+														 .Timestamp = AccessTimes[PlIndex],
+														 .RawHash	= RawHash,
+														 .Padding_0 = 0,
+														 .RawSize	= RawSize,
+														 .Padding_1 = 0});
+			if (ManifestDataBuffer.size() == MaxManifestDataBufferCount)
+			{
+				const uint64_t WriteSize = sizeof(ManifestData) * ManifestDataBuffer.size();
+				SidecarFile.Write(ManifestDataBuffer.data(), WriteSize, WriteOffset);
+				WriteOffset += WriteSize;
+				ManifestDataBuffer.clear();
+				ManifestDataBuffer.reserve(MaxManifestDataBufferCount);
+			}
+		}
+		if (ManifestDataBuffer.size() > 0)
+		{
+			SidecarFile.Write(ManifestDataBuffer.data(), sizeof(ManifestData) * ManifestDataBuffer.size(), WriteOffset);
+		}
+	}
+
+	SidecarFile.MoveTemporaryIntoPlace(SidecarPath, Ec);
+
+	if (Ec)
+	{
+		throw std::system_error(Ec, fmt::format("failed to move '{}' into '{}'", SidecarFile.GetPath(), SidecarPath));
+	}
 }
 
 //////////////////////////////////////////////////////////////////////////
 
+static const float IndexMinLoadFactor = 0.2f;
+static const float IndexMaxLoadFactor = 0.7f;
+
 ZenCacheDiskLayer::CacheBucket::CacheBucket(GcManager&				   Gc,
 											std::atomic_uint64_t&	   OuterCacheMemoryUsage,
 											std::string				   BucketName,
@@ -170,6 +674,9 @@ ZenCacheDiskLayer::CacheBucket::CacheBucket(GcManager&				   Gc,
 , m_Configuration(Config)
 , m_BucketId(Oid::Zero)
 {
+	m_Index.min_load_factor(IndexMinLoadFactor);
+	m_Index.max_load_factor(IndexMaxLoadFactor);
+
 	if (m_BucketName.starts_with(std::string_view("legacy")) || m_BucketName.ends_with(std::string_view("shadermap")))
 	{
 		const uint64_t LegacyOverrideSize = 16 * 1024 * 1024;
@@ -192,6 +699,10 @@ ZenCacheDiskLayer::CacheBucket::OpenOrCreate(std::filesystem::path BucketDir, bo
 	using namespace std::literals;
 
 	ZEN_TRACE_CPU("Z$::Disk::Bucket::OpenOrCreate");
+	ZEN_ASSERT(m_IsFlushing.load());
+
+	// We want to take the lock here since we register as a GC referencer a construction
+	RwLock::ExclusiveLockScope IndexLock(m_IndexLock);
 
 	ZEN_LOG_SCOPE("opening cache bucket '{}'", BucketDir);
 
@@ -200,169 +711,72 @@ ZenCacheDiskLayer::CacheBucket::OpenOrCreate(std::filesystem::path BucketDir, bo
 
 	CreateDirectories(m_BucketDir);
 
-	std::filesystem::path ManifestPath{m_BucketDir / "zen_manifest"};
+	std::filesystem::path ManifestPath = GetManifestPath(m_BucketDir, m_BucketName);
 
 	bool IsNew = false;
 
-	CbObject Manifest = LoadCompactBinaryObject(ManifestPath);
+	BucketManifestSerializer ManifestReader;
 
-	if (Manifest)
+	if (ManifestReader.Open(ManifestPath))
 	{
-		m_BucketId = Manifest["BucketId"sv].AsObjectId();
+		m_BucketId = ManifestReader.GetBucketId();
 		if (m_BucketId == Oid::Zero)
 		{
 			return false;
 		}
-		const uint32_t Version = Manifest["Version"sv].AsUInt32(0);
-		if (Version != CurrentDiskBucketVersion)
+
+		uint32_t Version = 0;
+		if (ManifestReader.IsCurrentVersion(/* out */ Version) == false)
 		{
-			ZEN_INFO("Wiping bucket '{}', found version {}, required version {}", BucketDir, Version, CurrentDiskBucketVersion);
+			ZEN_INFO("Wiping bucket '{}', found version {}, required version {}",
+					 BucketDir,
+					 Version,
+					 BucketManifestSerializer::CurrentDiskBucketVersion);
 			IsNew = true;
 		}
 	}
 	else if (AllowCreate)
 	{
-		m_BucketId.Generate();
-
-		CbObjectWriter Writer;
-		Writer << "BucketId"sv << m_BucketId;
-		Writer << "Version"sv << CurrentDiskBucketVersion;
-		Manifest = Writer.Save();
-		WriteFile(m_BucketDir / "zen_manifest", Manifest.GetBuffer().AsIoBuffer());
-		IsNew = true;
+		m_BucketId = ManifestReader.GenerateNewManifest(ManifestPath);
+		IsNew	   = true;
 	}
 	else
 	{
 		return false;
 	}
 
-	OpenLog(IsNew);
-
-	if (!IsNew)
-	{
-		ZEN_TRACE_CPU("Z$::Disk::Bucket::OpenOrCreate::Manifest");
-
-		Stopwatch  Timer;
-		const auto _ =
-			MakeGuard([&] { ZEN_INFO("read store manifest '{}' in {}", ManifestPath, NiceTimeSpanMs(Timer.GetElapsedTimeMs())); });
-
-		const uint64_t kInvalidIndex = ~(0ull);
+	InitializeIndexFromDisk(IndexLock, IsNew);
 
-		const uint64_t Count = Manifest["Count"sv].AsUInt64(0);
-		if (Count != 0)
-		{
-			std::vector<size_t> KeysIndexes;
-			KeysIndexes.reserve(Count);
-			CbArrayView KeyArray = Manifest["Keys"sv].AsArrayView();
-			for (CbFieldView& KeyView : KeyArray)
-			{
-				if (auto It = m_Index.find(KeyView.AsHash()); It != m_Index.end())
-				{
-					KeysIndexes.push_back(It.value());
-				}
-				else
-				{
-					KeysIndexes.push_back(kInvalidIndex);
-				}
-			}
-			size_t		KeyIndexOffset = 0;
-			CbArrayView TimeStampArray = Manifest["Timestamps"].AsArrayView();
-			for (CbFieldView& TimeStampView : TimeStampArray)
-			{
-				const size_t KeyIndex = KeysIndexes[KeyIndexOffset++];
-				if (KeyIndex != kInvalidIndex)
-				{
-					m_AccessTimes[KeyIndex] = TimeStampView.AsInt64();
-				}
-			}
-			KeyIndexOffset			 = 0;
-			CbArrayView RawHashArray = Manifest["RawHash"].AsArrayView();
-			CbArrayView RawSizeArray = Manifest["RawSize"].AsArrayView();
-			if (RawHashArray.Num() == RawSizeArray.Num())
-			{
-				auto RawHashIt = RawHashArray.CreateViewIterator();
-				auto RawSizeIt = RawSizeArray.CreateViewIterator();
-				while (RawHashIt != CbFieldViewIterator())
-				{
-					const size_t KeyIndex = KeysIndexes[KeyIndexOffset++];
-
-					if (KeyIndex != kInvalidIndex)
-					{
-						uint64_t RawSize = RawSizeIt.AsUInt64();
-						IoHash	 RawHash = RawHashIt.AsHash();
-						if (RawSize != 0 || RawHash != IoHash::Zero)
-						{
-							BucketPayload& Payload = m_Payloads[KeyIndex];
-							SetMetaData(Payload, BucketMetaData{.RawSize = RawSize, .RawHash = RawHash});
-						}
-					}
-
-					RawHashIt++;
-					RawSizeIt++;
-				}
-			}
-			else
-			{
-				ZEN_WARN("Mismatch in size between 'RawHash' and 'RawSize' arrays in {}, skipping meta data", ManifestPath);
-			}
-		}
-
-		////// Legacy format read
-		{
-			for (CbFieldView Entry : Manifest["Timestamps"sv])
-			{
-				const CbObjectView Obj = Entry.AsObjectView();
-				const IoHash	   Key = Obj["Key"sv].AsHash();
-
-				if (auto It = m_Index.find(Key); It != m_Index.end())
-				{
-					size_t EntryIndex = It.value();
-					ZEN_ASSERT_SLOW(EntryIndex < m_AccessTimes.size());
-					m_AccessTimes[EntryIndex] = Obj["LastAccess"sv].AsInt64();
-				}
-			}
-			for (CbFieldView Entry : Manifest["RawInfo"sv])
-			{
-				const CbObjectView Obj = Entry.AsObjectView();
-				const IoHash	   Key = Obj["Key"sv].AsHash();
-				if (auto It = m_Index.find(Key); It != m_Index.end())
-				{
-					size_t EntryIndex = It.value();
-					ZEN_ASSERT_SLOW(EntryIndex < m_Payloads.size());
-
-					const IoHash   RawHash = Obj["RawHash"sv].AsHash();
-					const uint64_t RawSize = Obj["RawSize"sv].AsUInt64();
-
-					if (RawHash == IoHash::Zero || RawSize == 0)
-					{
-						ZEN_SCOPED_ERROR("detected bad index entry in index - {}", EntryIndex);
-					}
+	auto _ = MakeGuard([&]() {
+		// We are now initialized, allow flushing when we exit
+		m_IsFlushing.store(false);
+	});
 
-					BucketPayload& Payload = m_Payloads[EntryIndex];
-					SetMetaData(Payload, BucketMetaData{.RawSize = RawSize, .RawHash = RawHash});
-				}
-			}
-		}
+	if (IsNew)
+	{
+		return true;
 	}
 
+	ManifestReader.ParseManifest(IndexLock, *this, ManifestPath, m_Index, m_AccessTimes, m_Payloads);
+
 	return true;
 }
 
 void
-ZenCacheDiskLayer::CacheBucket::MakeIndexSnapshot(const std::function<uint64_t()>& ClaimDiskReserveFunc)
+ZenCacheDiskLayer::CacheBucket::WriteIndexSnapshotLocked(const std::function<uint64_t()>& ClaimDiskReserveFunc)
 {
-	ZEN_TRACE_CPU("Z$::Disk::Bucket::MakeIndexSnapshot");
+	ZEN_TRACE_CPU("Z$::Disk::Bucket::WriteIndexSnapshot");
 
-	uint64_t LogCount = m_SlogFile.GetLogCount();
+	const uint64_t LogCount = m_SlogFile.GetLogCount();
 	if (m_LogFlushPosition == LogCount)
 	{
 		return;
 	}
 
 	ZEN_DEBUG("writing store snapshot for '{}'", m_BucketDir);
-	uint64_t   EntryCount = 0;
-	Stopwatch  Timer;
-	const auto _ = MakeGuard([&] {
+	const uint64_t EntryCount = m_Index.size();
+	Stopwatch	   Timer;
+	const auto	   _ = MakeGuard([&] {
 		ZEN_INFO("wrote store snapshot for '{}' containing {} entries in {}",
 				 m_BucketDir,
 				 EntryCount,
@@ -371,42 +785,11 @@ ZenCacheDiskLayer::CacheBucket::MakeIndexSnapshot(const std::function<uint64_t()
 
 	namespace fs = std::filesystem;
 
-	fs::path IndexPath	   = GetIndexPath(m_BucketDir, m_BucketName);
-	fs::path STmpIndexPath = GetTempIndexPath(m_BucketDir, m_BucketName);
-
-	// Move index away, we keep it if something goes wrong
-	if (fs::is_regular_file(STmpIndexPath))
-	{
-		std::error_code Ec;
-		if (!fs::remove(STmpIndexPath, Ec) || Ec)
-		{
-			ZEN_WARN("snapshot failed to clean up temp snapshot at {}, reason: '{}'", STmpIndexPath, Ec.message());
-			return;
-		}
-	}
+	fs::path IndexPath = GetIndexPath(m_BucketDir, m_BucketName);
 
 	try
 	{
-		if (fs::is_regular_file(IndexPath))
-		{
-			fs::rename(IndexPath, STmpIndexPath);
-		}
-
-		// Write the current state of the location map to a new index state
-		std::vector<DiskIndexEntry> Entries;
-		Entries.resize(m_Index.size());
-
-		{
-			uint64_t EntryIndex = 0;
-			for (auto& Entry : m_Index)
-			{
-				DiskIndexEntry& IndexEntry = Entries[EntryIndex++];
-				IndexEntry.Key			   = Entry.first;
-				IndexEntry.Location		   = m_Payloads[Entry.second].Location;
-			}
-		}
-
-		uint64_t		IndexSize = sizeof(CacheBucketIndexHeader) + Entries.size() * sizeof(DiskIndexEntry);
+		const uint64_t	IndexSize = sizeof(CacheBucketIndexHeader) + EntryCount * sizeof(DiskIndexEntry);
 		std::error_code Error;
 		DiskSpace		Space = DiskSpaceInfo(m_BucketDir, Error);
 		if (Error)
@@ -426,185 +809,230 @@ ZenCacheDiskLayer::CacheBucket::MakeIndexSnapshot(const std::function<uint64_t()
 				fmt::format("not enough free disk space in '{}' to save index of size {}", m_BucketDir, NiceBytes(IndexSize)));
 		}
 
-		BasicFile ObjectIndexFile;
-		ObjectIndexFile.Open(IndexPath, BasicFile::Mode::kTruncate);
-		CacheBucketIndexHeader Header = {.EntryCount	   = Entries.size(),
-										 .LogPosition	   = LogCount,
-										 .PayloadAlignment = gsl::narrow<uint32_t>(m_Configuration.PayloadAlignment)};
+		TemporaryFile	ObjectIndexFile;
+		std::error_code Ec;
+		ObjectIndexFile.CreateTemporary(m_BucketDir, Ec);
+		if (Ec)
+		{
+			throw std::system_error(Ec, fmt::format("failed to create new snapshot file in '{}'", m_BucketDir));
+		}
+
+		{
+			// This is in a separate scope just to ensure IndexWriter goes out
+			// of scope before the file is flushed/closed, in order to ensure
+			// all data is written to the file
+			BasicFileWriter IndexWriter(ObjectIndexFile, 128 * 1024);
 
-		Header.Checksum = CacheBucketIndexHeader::ComputeChecksum(Header);
-		ObjectIndexFile.Write(&Header, sizeof(CacheBucketIndexHeader), 0);
-		ObjectIndexFile.Write(Entries.data(), Entries.size() * sizeof(DiskIndexEntry), sizeof(CacheBucketIndexHeader));
-		ObjectIndexFile.Flush();
-		ObjectIndexFile.Close();
-		EntryCount		   = Entries.size();
-		m_LogFlushPosition = LogCount;
-	}
-	catch (std::exception& Err)
-	{
-		ZEN_WARN("snapshot FAILED, reason: '{}'", Err.what());
+			CacheBucketIndexHeader Header = {.EntryCount	   = EntryCount,
+											 .LogPosition	   = LogCount,
+											 .PayloadAlignment = gsl::narrow<uint32_t>(m_Configuration.PayloadAlignment)};
+
+			Header.Checksum = CacheBucketIndexHeader::ComputeChecksum(Header);
+			IndexWriter.Write(&Header, sizeof(CacheBucketIndexHeader), 0);
+
+			uint64_t IndexWriteOffset = sizeof(CacheBucketIndexHeader);
 
-		// Restore any previous snapshot
+			for (auto& Entry : m_Index)
+			{
+				DiskIndexEntry IndexEntry;
+				IndexEntry.Key		= Entry.first;
+				IndexEntry.Location = m_Payloads[Entry.second].Location;
+				IndexWriter.Write(&IndexEntry, sizeof(DiskIndexEntry), IndexWriteOffset);
+
+				IndexWriteOffset += sizeof(DiskIndexEntry);
+			}
+
+			IndexWriter.Flush();
+		}
 
-		if (fs::is_regular_file(STmpIndexPath))
+		ObjectIndexFile.Flush();
+		ObjectIndexFile.MoveTemporaryIntoPlace(IndexPath, Ec);
+		if (Ec)
 		{
-			std::error_code Ec;
-			fs::remove(IndexPath, Ec);	// We don't care if this fails, we try to move the old temp file regardless
-			fs::rename(STmpIndexPath, IndexPath, Ec);
-			if (Ec)
+			std::filesystem::path TempFilePath = ObjectIndexFile.GetPath();
+			ZEN_WARN("snapshot failed to rename new snapshot '{}' to '{}', reason: '{}'", TempFilePath, IndexPath, Ec.message());
+
+			if (std::filesystem::is_regular_file(TempFilePath))
 			{
-				ZEN_WARN("snapshot failed to restore old snapshot from {}, reason: '{}'", STmpIndexPath, Ec.message());
+				if (!std::filesystem::remove(TempFilePath, Ec) || Ec)
+				{
+					ZEN_WARN("snapshot failed to remove temporary file {}, reason: '{}'", TempFilePath, Ec.message());
+				}
 			}
 		}
-	}
-	if (fs::is_regular_file(STmpIndexPath))
-	{
-		std::error_code Ec;
-		if (!fs::remove(STmpIndexPath, Ec) || Ec)
+		else
 		{
-			ZEN_WARN("snapshot failed to remove temporary file {}, reason: '{}'", STmpIndexPath, Ec.message());
+			// We must only update the log flush position once the snapshot write succeeds
+			m_LogFlushPosition = LogCount;
 		}
 	}
+	catch (std::exception& Err)
+	{
+		ZEN_WARN("snapshot FAILED, reason: '{}'", Err.what());
+	}
 }
 
 uint64_t
-ZenCacheDiskLayer::CacheBucket::ReadIndexFile(const std::filesystem::path& IndexPath, uint32_t& OutVersion)
+ZenCacheDiskLayer::CacheBucket::ReadIndexFile(RwLock::ExclusiveLockScope&, const std::filesystem::path& IndexPath, uint32_t& OutVersion)
 {
 	ZEN_TRACE_CPU("Z$::Disk::Bucket::ReadIndexFile");
 
-	if (std::filesystem::is_regular_file(IndexPath))
+	if (!std::filesystem::is_regular_file(IndexPath))
 	{
-		BasicFile ObjectIndexFile;
-		ObjectIndexFile.Open(IndexPath, BasicFile::Mode::kRead);
-		uint64_t Size = ObjectIndexFile.FileSize();
-		if (Size >= sizeof(CacheBucketIndexHeader))
-		{
-			CacheBucketIndexHeader Header;
-			ObjectIndexFile.Read(&Header, sizeof(Header), 0);
-			if ((Header.Magic == CacheBucketIndexHeader::ExpectedMagic) &&
-				(Header.Checksum == CacheBucketIndexHeader::ComputeChecksum(Header)) && (Header.PayloadAlignment > 0))
-			{
-				switch (Header.Version)
-				{
-					case CacheBucketIndexHeader::Version2:
-						{
-							uint64_t ExpectedEntryCount = (Size - sizeof(sizeof(CacheBucketIndexHeader))) / sizeof(DiskIndexEntry);
-							if (Header.EntryCount > ExpectedEntryCount)
-							{
-								break;
-							}
-							size_t	   EntryCount = 0;
-							Stopwatch  Timer;
-							const auto _ = MakeGuard([&] {
-								ZEN_INFO("read store '{}' index containing {} entries in {}",
-										 IndexPath,
-										 EntryCount,
-										 NiceTimeSpanMs(Timer.GetElapsedTimeMs()));
-							});
+		return 0;
+	}
 
-							m_Configuration.PayloadAlignment = Header.PayloadAlignment;
+	auto InvalidGuard = MakeGuard([&] { ZEN_WARN("skipping invalid index file '{}'", IndexPath); });
 
-							std::vector<DiskIndexEntry> Entries;
-							Entries.resize(Header.EntryCount);
-							ObjectIndexFile.Read(Entries.data(),
-												 Header.EntryCount * sizeof(DiskIndexEntry),
-												 sizeof(CacheBucketIndexHeader));
+	BasicFile ObjectIndexFile;
+	ObjectIndexFile.Open(IndexPath, BasicFile::Mode::kRead);
+	uint64_t FileSize = ObjectIndexFile.FileSize();
+	if (FileSize < sizeof(CacheBucketIndexHeader))
+	{
+		return 0;
+	}
 
-							m_Payloads.reserve(Header.EntryCount);
-							m_Index.reserve(Header.EntryCount);
+	CacheBucketIndexHeader Header;
+	ObjectIndexFile.Read(&Header, sizeof(Header), 0);
 
-							std::string InvalidEntryReason;
-							for (const DiskIndexEntry& Entry : Entries)
-							{
-								if (!ValidateCacheBucketIndexEntry(Entry, InvalidEntryReason))
-								{
-									ZEN_WARN("skipping invalid entry in '{}', reason: '{}'", IndexPath, InvalidEntryReason);
-									continue;
-								}
-								PayloadIndex EntryIndex = PayloadIndex(m_Payloads.size());
-								m_Payloads.emplace_back(BucketPayload{.Location = Entry.Location});
-								m_Index.insert_or_assign(Entry.Key, EntryIndex);
-								EntryCount++;
-							}
-							m_AccessTimes.resize(m_Payloads.size(), AccessTime(GcClock::TickCount()));
-							if (m_Configuration.EnableReferenceCaching)
-							{
-								m_FirstReferenceIndex.resize(m_Payloads.size());
-							}
-							OutVersion = CacheBucketIndexHeader::Version2;
-							return Header.LogPosition;
-						}
-						break;
-					default:
-						break;
-				}
-			}
+	if (!Header.IsValid())
+	{
+		return 0;
+	}
+
+	if (Header.Version != CacheBucketIndexHeader::Version2)
+	{
+		return 0;
+	}
+
+	const uint64_t ExpectedEntryCount = (FileSize - sizeof(sizeof(CacheBucketIndexHeader))) / sizeof(DiskIndexEntry);
+	if (Header.EntryCount > ExpectedEntryCount)
+	{
+		return 0;
+	}
+
+	InvalidGuard.Dismiss();
+
+	size_t	   EntryCount = 0;
+	Stopwatch  Timer;
+	const auto _ = MakeGuard([&] {
+		ZEN_INFO("read store '{}' index containing {} entries in {}", IndexPath, EntryCount, NiceTimeSpanMs(Timer.GetElapsedTimeMs()));
+	});
+
+	m_Configuration.PayloadAlignment = Header.PayloadAlignment;
+
+	m_Payloads.reserve(Header.EntryCount);
+	m_Index.reserve(Header.EntryCount);
+
+	BasicFileBuffer FileBuffer(ObjectIndexFile, 128 * 1024);
+
+	uint64_t CurrentReadOffset	 = sizeof(CacheBucketIndexHeader);
+	uint64_t RemainingEntryCount = Header.EntryCount;
+
+	std::string InvalidEntryReason;
+	while (RemainingEntryCount--)
+	{
+		const DiskIndexEntry* Entry = FileBuffer.MakeView<DiskIndexEntry>(CurrentReadOffset);
+		CurrentReadOffset += sizeof(DiskIndexEntry);
+
+		if (!ValidateCacheBucketIndexEntry(*Entry, InvalidEntryReason))
+		{
+			ZEN_WARN("skipping invalid entry in '{}', reason: '{}'", IndexPath, InvalidEntryReason);
+			continue;
 		}
-		ZEN_WARN("skipping invalid index file '{}'", IndexPath);
+
+		const PayloadIndex EntryIndex = PayloadIndex(EntryCount);
+		m_Payloads.emplace_back(BucketPayload{.Location = Entry->Location});
+		m_Index.insert_or_assign(Entry->Key, EntryIndex);
+
+		EntryCount++;
 	}
-	return 0;
+
+	ZEN_ASSERT(EntryCount == m_Payloads.size());
+
+	m_AccessTimes.resize(EntryCount, AccessTime(GcClock::TickCount()));
+
+	if (m_Configuration.EnableReferenceCaching)
+	{
+		m_FirstReferenceIndex.resize(EntryCount);
+	}
+
+	OutVersion = CacheBucketIndexHeader::Version2;
+	return Header.LogPosition;
 }
 
 uint64_t
-ZenCacheDiskLayer::CacheBucket::ReadLog(const std::filesystem::path& LogPath, uint64_t SkipEntryCount)
+ZenCacheDiskLayer::CacheBucket::ReadLog(RwLock::ExclusiveLockScope&, const std::filesystem::path& LogPath, uint64_t SkipEntryCount)
 {
 	ZEN_TRACE_CPU("Z$::Disk::Bucket::ReadLog");
 
-	if (std::filesystem::is_regular_file(LogPath))
+	if (!std::filesystem::is_regular_file(LogPath))
 	{
-		uint64_t					LogEntryCount = 0;
-		Stopwatch					Timer;
-		const auto					_ = MakeGuard([&] {
-			 ZEN_INFO("read store '{}' log containing {} entries in {}", LogPath, LogEntryCount, NiceTimeSpanMs(Timer.GetElapsedTimeMs()));
-		 });
-		TCasLogFile<DiskIndexEntry> CasLog;
-		CasLog.Open(LogPath, CasLogFile::Mode::kRead);
-		if (CasLog.Initialize())
-		{
-			uint64_t EntryCount = CasLog.GetLogCount();
-			if (EntryCount < SkipEntryCount)
-			{
-				ZEN_WARN("reading full log at '{}', reason: Log position from index snapshot is out of range", LogPath);
-				SkipEntryCount = 0;
-			}
-			LogEntryCount			   = EntryCount - SkipEntryCount;
-			uint64_t InvalidEntryCount = 0;
-			CasLog.Replay(
-				[&](const DiskIndexEntry& Record) {
-					std::string InvalidEntryReason;
-					if (Record.Location.Flags & DiskLocation::kTombStone)
-					{
-						m_Index.erase(Record.Key);
-						return;
-					}
-					if (!ValidateCacheBucketIndexEntry(Record, InvalidEntryReason))
-					{
-						ZEN_WARN("skipping invalid entry in '{}', reason: '{}'", LogPath, InvalidEntryReason);
-						++InvalidEntryCount;
-						return;
-					}
-					PayloadIndex EntryIndex = PayloadIndex(m_Payloads.size());
-					m_Payloads.emplace_back(BucketPayload{.Location = Record.Location});
-					m_Index.insert_or_assign(Record.Key, EntryIndex);
-				},
-				SkipEntryCount);
-			m_AccessTimes.resize(m_Payloads.size(), AccessTime(GcClock::TickCount()));
-			if (m_Configuration.EnableReferenceCaching)
+		return 0;
+	}
+
+	uint64_t   LogEntryCount = 0;
+	Stopwatch  Timer;
+	const auto _ = MakeGuard([&] {
+		ZEN_INFO("read store '{}' log containing {} entries in {}", LogPath, LogEntryCount, NiceTimeSpanMs(Timer.GetElapsedTimeMs()));
+	});
+
+	TCasLogFile<DiskIndexEntry> CasLog;
+	CasLog.Open(LogPath, CasLogFile::Mode::kRead);
+	if (!CasLog.Initialize())
+	{
+		return 0;
+	}
+
+	const uint64_t EntryCount = CasLog.GetLogCount();
+	if (EntryCount < SkipEntryCount)
+	{
+		ZEN_WARN("reading full log at '{}', reason: Log position from index snapshot is out of range", LogPath);
+		SkipEntryCount = 0;
+	}
+
+	LogEntryCount			   = EntryCount - SkipEntryCount;
+	uint64_t InvalidEntryCount = 0;
+
+	CasLog.Replay(
+		[&](const DiskIndexEntry& Record) {
+			std::string InvalidEntryReason;
+			if (Record.Location.Flags & DiskLocation::kTombStone)
 			{
-				m_FirstReferenceIndex.resize(m_Payloads.size());
+				// Note: this leaves m_Payloads and other arrays with 'holes' in them
+				m_Index.erase(Record.Key);
+				return;
 			}
-			if (InvalidEntryCount)
+
+			if (!ValidateCacheBucketIndexEntry(Record, InvalidEntryReason))
 			{
-				ZEN_WARN("found {} invalid entries in '{}'", InvalidEntryCount, m_BucketDir);
+				ZEN_WARN("skipping invalid entry in '{}', reason: '{}'", LogPath, InvalidEntryReason);
+				++InvalidEntryCount;
+				return;
 			}
-			return LogEntryCount;
-		}
+			PayloadIndex EntryIndex = PayloadIndex(m_Payloads.size());
+			m_Payloads.emplace_back(BucketPayload{.Location = Record.Location});
+			m_Index.insert_or_assign(Record.Key, EntryIndex);
+		},
+		SkipEntryCount);
+
+	m_AccessTimes.resize(m_Payloads.size(), AccessTime(GcClock::TickCount()));
+
+	if (m_Configuration.EnableReferenceCaching)
+	{
+		m_FirstReferenceIndex.resize(m_Payloads.size());
 	}
-	return 0;
+
+	if (InvalidEntryCount)
+	{
+		ZEN_WARN("found {} invalid entries in '{}'", InvalidEntryCount, m_BucketDir);
+	}
+
+	return LogEntryCount;
 };
 
 void
-ZenCacheDiskLayer::CacheBucket::OpenLog(const bool IsNew)
+ZenCacheDiskLayer::CacheBucket::InitializeIndexFromDisk(RwLock::ExclusiveLockScope& IndexLock, const bool IsNew)
 {
 	ZEN_TRACE_CPU("Z$::Disk::Bucket::OpenLog");
 
@@ -639,7 +1067,7 @@ ZenCacheDiskLayer::CacheBucket::OpenLog(const bool IsNew)
 	if (std::filesystem::is_regular_file(IndexPath))
 	{
 		uint32_t IndexVersion = 0;
-		m_LogFlushPosition	  = ReadIndexFile(IndexPath, IndexVersion);
+		m_LogFlushPosition	  = ReadIndexFile(IndexLock, IndexPath, IndexVersion);
 		if (IndexVersion == 0)
 		{
 			ZEN_WARN("removing invalid index file at '{}'", IndexPath);
@@ -652,19 +1080,18 @@ ZenCacheDiskLayer::CacheBucket::OpenLog(const bool IsNew)
 	{
 		if (TCasLogFile<DiskIndexEntry>::IsValid(LogPath))
 		{
-			LogEntryCount = ReadLog(LogPath, m_LogFlushPosition);
+			LogEntryCount = ReadLog(IndexLock, LogPath, m_LogFlushPosition);
 		}
 		else if (fs::is_regular_file(LogPath))
 		{
-			ZEN_WARN("removing invalid cas log at '{}'", LogPath);
+			ZEN_WARN("removing invalid log at '{}'", LogPath);
 			std::filesystem::remove(LogPath);
 		}
 	}
 
 	m_SlogFile.Open(LogPath, CasLogFile::Mode::kWrite);
 
-	std::vector<BlockStoreLocation> KnownLocations;
-	KnownLocations.reserve(m_Index.size());
+	BlockStore::BlockIndexSet KnownBlocks;
 	for (const auto& Entry : m_Index)
 	{
 		size_t				 EntryIndex = Entry.second;
@@ -674,19 +1101,19 @@ ZenCacheDiskLayer::CacheBucket::OpenLog(const bool IsNew)
 		if (Location.IsFlagSet(DiskLocation::kStandaloneFile))
 		{
 			m_StandaloneSize.fetch_add(Location.Size(), std::memory_order::relaxed);
-			continue;
 		}
-		const BlockStoreLocation& BlockLocation = Location.GetBlockLocation(m_Configuration.PayloadAlignment);
-		KnownLocations.push_back(BlockLocation);
+		else
+		{
+			const BlockStoreLocation& BlockLocation = Location.GetBlockLocation(m_Configuration.PayloadAlignment);
+			KnownBlocks.Add(BlockLocation.BlockIndex);
+		}
 	}
-
-	m_BlockStore.SyncExistingBlocksOnDisk(KnownLocations);
+	m_BlockStore.SyncExistingBlocksOnDisk(KnownBlocks);
 
 	if (IsNew || LogEntryCount > 0)
 	{
-		MakeIndexSnapshot();
+		WriteIndexSnapshot(IndexLock);
 	}
-	// TODO: should validate integrity of container files here
 }
 
 void
@@ -759,7 +1186,7 @@ ZenCacheDiskLayer::CacheBucket::Get(const IoHash& HashKey, ZenCacheValue& OutVal
 		return false;
 	}
 
-	size_t EntryIndex		  = It.value();
+	PayloadIndex EntryIndex	  = It.value();
 	m_AccessTimes[EntryIndex] = GcClock::TickCount();
 	DiskLocation Location	  = m_Payloads[EntryIndex].Location;
 
@@ -776,7 +1203,7 @@ ZenCacheDiskLayer::CacheBucket::Get(const IoHash& HashKey, ZenCacheValue& OutVal
 
 	if (Payload->MemCached)
 	{
-		OutValue.Value = m_MemCachedPayloads[Payload->MemCached];
+		OutValue.Value = m_MemCachedPayloads[Payload->MemCached].Payload;
 		Payload		   = nullptr;
 		IndexLock.ReleaseNow();
 		m_MemoryHitCount++;
@@ -803,14 +1230,14 @@ ZenCacheDiskLayer::CacheBucket::Get(const IoHash& HashKey, ZenCacheValue& OutVal
 				{
 					ZEN_TRACE_CPU("Z$::Disk::Bucket::Get::MemCache");
 					OutValue.Value = IoBufferBuilder::ReadFromFileMaybe(OutValue.Value);
-					RwLock::ExclusiveLockScope _(m_IndexLock);
+					RwLock::ExclusiveLockScope UpdateIndexLock(m_IndexLock);
 					if (auto UpdateIt = m_Index.find(HashKey); UpdateIt != m_Index.end())
 					{
-						BucketPayload& WritePayload = m_Payloads[EntryIndex];
+						BucketPayload& WritePayload = m_Payloads[UpdateIt->second];
 						// Only update if it has not already been updated by other thread
 						if (!WritePayload.MemCached)
 						{
-							SetMemCachedData(WritePayload, OutValue.Value);
+							SetMemCachedData(UpdateIndexLock, UpdateIt->second, OutValue.Value);
 						}
 					}
 				}
@@ -835,7 +1262,7 @@ ZenCacheDiskLayer::CacheBucket::Get(const IoHash& HashKey, ZenCacheValue& OutVal
 			OutValue.RawHash = IoHash::HashBuffer(OutValue.Value);
 			OutValue.RawSize = OutValue.Value.GetSize();
 		}
-		RwLock::ExclusiveLockScope __(m_IndexLock);
+		RwLock::ExclusiveLockScope UpdateIndexLock(m_IndexLock);
 		if (auto WriteIt = m_Index.find(HashKey); WriteIt != m_Index.end())
 		{
 			BucketPayload& WritePayload = m_Payloads[WriteIt.value()];
@@ -843,7 +1270,7 @@ ZenCacheDiskLayer::CacheBucket::Get(const IoHash& HashKey, ZenCacheValue& OutVal
 			// Only set if no other path has already updated the meta data
 			if (!WritePayload.MetaData)
 			{
-				SetMetaData(WritePayload, {.RawSize = OutValue.RawSize, .RawHash = OutValue.RawHash});
+				SetMetaData(UpdateIndexLock, WritePayload, {.RawSize = OutValue.RawSize, .RawHash = OutValue.RawHash});
 			}
 		}
 	}
@@ -877,48 +1304,84 @@ ZenCacheDiskLayer::CacheBucket::Put(const IoHash& HashKey, const ZenCacheValue&
 	m_DiskWriteCount++;
 }
 
-void
+uint64_t
 ZenCacheDiskLayer::CacheBucket::MemCacheTrim(GcClock::TimePoint ExpireTime)
 {
+	ZEN_TRACE_CPU("Z$::Disk::Bucket::MemCacheTrim");
+
+	uint64_t	  Trimmed	  = 0;
 	GcClock::Tick ExpireTicks = ExpireTime.time_since_epoch().count();
 
-	RwLock::ExclusiveLockScope _(m_IndexLock);
-	for (const auto& Kv : m_Index)
+	RwLock::ExclusiveLockScope IndexLock(m_IndexLock);
+	uint32_t				   MemCachedCount = gsl::narrow<uint32_t>(m_MemCachedPayloads.size());
+	if (MemCachedCount == 0)
 	{
-		if (m_AccessTimes[Kv.second] < ExpireTicks)
+		return 0;
+	}
+
+	uint32_t WriteIndex = 0;
+	for (uint32_t ReadIndex = 0; ReadIndex < MemCachedCount; ++ReadIndex)
+	{
+		MemCacheData& Data = m_MemCachedPayloads[ReadIndex];
+		if (!Data.Payload)
 		{
-			BucketPayload& Payload = m_Payloads[Kv.second];
-			RemoveMemCachedData(Payload);
+			continue;
 		}
+		PayloadIndex Index = Data.OwnerIndex;
+		ZEN_ASSERT_SLOW(m_Payloads[Index].MemCached == MemCachedIndex(ReadIndex));
+		GcClock::Tick AccessTime = m_AccessTimes[Index];
+		if (AccessTime < ExpireTicks)
+		{
+			size_t PayloadSize = Data.Payload.GetSize();
+			RemoveMemCacheUsage(EstimateMemCachePayloadMemory(PayloadSize));
+			Data						= {};
+			m_Payloads[Index].MemCached = {};
+			Trimmed += PayloadSize;
+			continue;
+		}
+		if (ReadIndex > WriteIndex)
+		{
+			m_MemCachedPayloads[WriteIndex] = MemCacheData{.Payload = std::move(Data.Payload), .OwnerIndex = Index};
+			m_Payloads[Index].MemCached		= MemCachedIndex(WriteIndex);
+		}
+		WriteIndex++;
 	}
+	m_MemCachedPayloads.resize(WriteIndex);
+	m_MemCachedPayloads.shrink_to_fit();
+	zen::Reset(m_FreeMemCachedPayloads);
+	return Trimmed;
 }
 
 void
-ZenCacheDiskLayer::CacheBucket::GetUsageByAccess(GcClock::TimePoint		TickStart,
-												 GcClock::Duration		SectionLength,
-												 std::vector<uint64_t>& InOutUsageSlots)
+ZenCacheDiskLayer::CacheBucket::GetUsageByAccess(GcClock::TimePoint Now, GcClock::Duration MaxAge, std::vector<uint64_t>& InOutUsageSlots)
 {
+	ZEN_TRACE_CPU("Z$::Disk::Bucket::GetUsageByAccess");
+
+	size_t					SlotCount = InOutUsageSlots.capacity();
 	RwLock::SharedLockScope _(m_IndexLock);
-	for (const auto& It : m_Index)
+	uint32_t				MemCachedCount = gsl::narrow<uint32_t>(m_MemCachedPayloads.size());
+	if (MemCachedCount == 0)
 	{
-		size_t		   Index   = It.second;
-		BucketPayload& Payload = m_Payloads[Index];
-		if (!Payload.MemCached)
+		return;
+	}
+	for (uint32_t ReadIndex = 0; ReadIndex < MemCachedCount; ++ReadIndex)
+	{
+		MemCacheData& Data = m_MemCachedPayloads[ReadIndex];
+		if (!Data.Payload)
 		{
 			continue;
 		}
+		PayloadIndex Index = Data.OwnerIndex;
+		ZEN_ASSERT_SLOW(m_Payloads[Index].MemCached == MemCachedIndex(ReadIndex));
 		GcClock::TimePoint ItemAccessTime = GcClock::TimePointFromTick(GcClock::Tick(m_AccessTimes[Index]));
-		GcClock::Duration  Age			  = TickStart.time_since_epoch() - ItemAccessTime.time_since_epoch();
-		uint64_t		   Slot			  = gsl::narrow<uint64_t>(Age.count() > 0 ? Age.count() / SectionLength.count() : 0);
-		if (Slot >= InOutUsageSlots.capacity())
+		GcClock::Duration  Age			  = Now > ItemAccessTime ? Now - ItemAccessTime : GcClock::Duration(0);
+		size_t			   Slot = Age < MaxAge ? gsl::narrow<size_t>((Age.count() * SlotCount) / MaxAge.count()) : (SlotCount - 1);
+		ZEN_ASSERT_SLOW(Slot < SlotCount);
+		if (Slot >= InOutUsageSlots.size())
 		{
-			Slot = InOutUsageSlots.capacity() - 1;
+			InOutUsageSlots.resize(Slot + 1, 0);
 		}
-		if (Slot > InOutUsageSlots.size())
-		{
-			InOutUsageSlots.resize(uint64_t(Slot + 1), 0);
-		}
-		InOutUsageSlots[Slot] += m_MemCachedPayloads[Payload.MemCached].GetSize();
+		InOutUsageSlots[Slot] += EstimateMemCachePayloadMemory(Data.Payload.GetSize());
 	}
 }
 
@@ -976,20 +1439,7 @@ ZenCacheDiskLayer::CacheBucket::Flush()
 		m_BlockStore.Flush(/*ForceNewBlock*/ false);
 		m_SlogFile.Flush();
 
-		std::vector<AccessTime>		AccessTimes;
-		std::vector<BucketPayload>	Payloads;
-		std::vector<BucketMetaData> MetaDatas;
-		IndexMap					Index;
-
-		{
-			RwLock::SharedLockScope IndexLock(m_IndexLock);
-			MakeIndexSnapshot();
-			Index		= m_Index;
-			Payloads	= m_Payloads;
-			AccessTimes = m_AccessTimes;
-			MetaDatas	= m_MetaDatas;
-		}
-		SaveManifest(MakeManifest(std::move(Index), std::move(AccessTimes), Payloads, MetaDatas));
+		SaveSnapshot();
 	}
 	catch (std::exception& Ex)
 	{
@@ -998,113 +1448,108 @@ ZenCacheDiskLayer::CacheBucket::Flush()
 }
 
 void
-ZenCacheDiskLayer::CacheBucket::SaveManifest(CbObject&& Manifest, const std::function<uint64_t()>& ClaimDiskReserveFunc)
+ZenCacheDiskLayer::CacheBucket::SaveSnapshot(const std::function<uint64_t()>& ClaimDiskReserveFunc)
 {
-	ZEN_TRACE_CPU("Z$::Disk::Bucket::SaveManifest");
 	try
 	{
-		IoBuffer Buffer = Manifest.GetBuffer().AsIoBuffer();
-
-		std::error_code Error;
-		DiskSpace		Space = DiskSpaceInfo(m_BucketDir, Error);
-		if (Error)
-		{
-			ZEN_WARN("get disk space in '{}' FAILED, reason: '{}'", m_BucketDir, Error.message());
-			return;
-		}
-		bool EnoughSpace = Space.Free >= Buffer.GetSize() + 1024 * 512;
-		if (!EnoughSpace)
-		{
-			uint64_t ReclaimedSpace = ClaimDiskReserveFunc();
-			EnoughSpace				= (Space.Free + ReclaimedSpace) >= Buffer.GetSize() + 1024 * 512;
-		}
-		if (!EnoughSpace)
-		{
-			ZEN_WARN("not enough free disk space in '{}'. FAILED to save manifest of size {}", m_BucketDir, NiceBytes(Buffer.GetSize()));
-			return;
-		}
-		WriteFile(m_BucketDir / "zen_manifest", Buffer);
-	}
-	catch (std::exception& Err)
-	{
-		ZEN_WARN("writing manifest in '{}' FAILED, reason: '{}'", m_BucketDir, Err.what());
-	}
-}
+		bool UseLegacyScheme = false;
 
-CbObject
-ZenCacheDiskLayer::CacheBucket::MakeManifest(IndexMap&&							Index,
-											 std::vector<AccessTime>&&			AccessTimes,
-											 const std::vector<BucketPayload>&	Payloads,
-											 const std::vector<BucketMetaData>& MetaDatas)
-{
-	using namespace std::literals;
+		IoBuffer				 Buffer;
+		BucketManifestSerializer ManifestWriter;
 
-	ZEN_TRACE_CPU("Z$::Disk::Bucket::MakeManifest");
-
-	size_t ItemCount = Index.size();
+		if (UseLegacyScheme)
+		{
+			std::vector<AccessTime>		AccessTimes;
+			std::vector<BucketPayload>	Payloads;
+			std::vector<BucketMetaData> MetaDatas;
+			IndexMap					Index;
 
-	// This tends to overestimate a little bit but it is still way more accurate than what we get with exponential growth
-	// And we don't need to reallocate theunderying buffer in almost every case
-	const size_t   EstimatedSizePerItem = 54u;
-	const size_t   ReserveSize			= ItemCount == 0 ? 48u : RoundUp(32u + (ItemCount * EstimatedSizePerItem), 128);
-	CbObjectWriter Writer(ReserveSize);
+			{
+				RwLock::SharedLockScope IndexLock(m_IndexLock);
+				WriteIndexSnapshot(IndexLock);
+				// Note: this copy could be eliminated on shutdown to
+				// reduce memory usage and execution time
+				Index		= m_Index;
+				Payloads	= m_Payloads;
+				AccessTimes = m_AccessTimes;
+				MetaDatas	= m_MetaDatas;
+			}
 
-	Writer << "BucketId"sv << m_BucketId;
-	Writer << "Version"sv << CurrentDiskBucketVersion;
+			Buffer						 = ManifestWriter.MakeManifest(m_BucketId,
+												   std::move(Index),
+												   std::move(AccessTimes),
+												   std::move(Payloads),
+												   std::move(MetaDatas));
+			const uint64_t RequiredSpace = Buffer.GetSize() + 1024 * 512;
 
-	if (!Index.empty())
-	{
-		Writer.AddInteger("Count"sv, gsl::narrow<std::uint64_t>(Index.size()));
-		Writer.BeginArray("Keys"sv);
-		for (auto& Kv : Index)
-		{
-			const IoHash& Key = Kv.first;
-			Writer.AddHash(Key);
+			std::error_code Error;
+			DiskSpace		Space = DiskSpaceInfo(m_BucketDir, Error);
+			if (Error)
+			{
+				ZEN_WARN("get disk space in '{}' FAILED, reason: '{}'", m_BucketDir, Error.message());
+				return;
+			}
+			bool EnoughSpace = Space.Free >= RequiredSpace;
+			if (!EnoughSpace)
+			{
+				uint64_t ReclaimedSpace = ClaimDiskReserveFunc();
+				EnoughSpace				= (Space.Free + ReclaimedSpace) >= RequiredSpace;
+			}
+			if (!EnoughSpace)
+			{
+				ZEN_WARN("not enough free disk space in '{}'. FAILED to save manifest of size {}",
+						 m_BucketDir,
+						 NiceBytes(Buffer.GetSize()));
+				return;
+			}
 		}
-		Writer.EndArray();
-
-		Writer.BeginArray("Timestamps"sv);
-		for (auto& Kv : Index)
+		else
 		{
-			GcClock::Tick AccessTime = AccessTimes[Kv.second];
-			Writer.AddInteger(AccessTime);
-		}
-		Writer.EndArray();
+			RwLock::SharedLockScope IndexLock(m_IndexLock);
+			WriteIndexSnapshot(IndexLock);
+			const uint64_t EntryCount = m_Index.size();
+			Buffer					  = ManifestWriter.MakeSidecarManifest(m_BucketId, EntryCount);
+			uint64_t SidecarSize	  = ManifestWriter.GetSidecarSize();
 
-		if (!MetaDatas.empty())
-		{
-			Writer.BeginArray("RawHash"sv);
-			for (auto& Kv : Index)
+			const uint64_t RequiredSpace = SidecarSize + Buffer.GetSize() + 1024 * 512;
+
+			std::error_code Error;
+			DiskSpace		Space = DiskSpaceInfo(m_BucketDir, Error);
+			if (Error)
 			{
-				const BucketPayload& Payload = Payloads[Kv.second];
-				if (Payload.MetaData)
-				{
-					Writer.AddHash(MetaDatas[Payload.MetaData].RawHash);
-				}
-				else
-				{
-					Writer.AddHash(IoHash::Zero);
-				}
+				ZEN_WARN("get disk space in '{}' FAILED, reason: '{}'", m_BucketDir, Error.message());
+				return;
 			}
-			Writer.EndArray();
-
-			Writer.BeginArray("RawSize"sv);
-			for (auto& Kv : Index)
+			bool EnoughSpace = Space.Free >= RequiredSpace;
+			if (!EnoughSpace)
 			{
-				const BucketPayload& Payload = Payloads[Kv.second];
-				if (Payload.MetaData)
-				{
-					Writer.AddInteger(MetaDatas[Payload.MetaData].RawSize);
-				}
-				else
-				{
-					Writer.AddInteger(0);
-				}
+				uint64_t ReclaimedSpace = ClaimDiskReserveFunc();
+				EnoughSpace				= (Space.Free + ReclaimedSpace) >= RequiredSpace;
 			}
-			Writer.EndArray();
+			if (!EnoughSpace)
+			{
+				ZEN_WARN("not enough free disk space in '{}'. FAILED to save manifest of size {}",
+						 m_BucketDir,
+						 NiceBytes(Buffer.GetSize()));
+				return;
+			}
+
+			ManifestWriter.WriteSidecarFile(IndexLock,
+											GetMetaPath(m_BucketDir, m_BucketName),
+											m_LogFlushPosition,
+											m_Index,
+											m_AccessTimes,
+											m_Payloads,
+											m_MetaDatas);
 		}
+
+		std::filesystem::path ManifestPath = GetManifestPath(m_BucketDir, m_BucketName);
+		WriteFile(ManifestPath, Buffer);
+	}
+	catch (std::exception& Err)
+	{
+		ZEN_WARN("writing manifest in '{}' FAILED, reason: '{}'", m_BucketDir, Err.what());
 	}
-	return Writer.Save();
 }
 
 IoHash
@@ -1364,8 +1809,8 @@ ZenCacheDiskLayer::CacheBucket::ScrubStorage(ScrubContext& Ctx)
 						m_StandaloneSize.fetch_sub(Location.Size(), std::memory_order::relaxed);
 					}
 
-					RemoveMemCachedData(Payload);
-					RemoveMetaData(Payload);
+					RemoveMemCachedData(IndexLock, Payload);
+					RemoveMetaData(IndexLock, Payload);
 
 					Location.Flags |= DiskLocation::kTombStone;
 					LogEntries.push_back(DiskIndexEntry{.Key = BadKey, .Location = Location});
@@ -1395,13 +1840,13 @@ ZenCacheDiskLayer::CacheBucket::ScrubStorage(ScrubContext& Ctx)
 				std::vector<BucketPayload>	Payloads;
 				std::vector<AccessTime>		AccessTimes;
 				std::vector<BucketMetaData> MetaDatas;
-				std::vector<IoBuffer>		MemCachedPayloads;
+				std::vector<MemCacheData>	MemCachedPayloads;
 				std::vector<ReferenceIndex> FirstReferenceIndex;
 				IndexMap					Index;
 
 				{
 					RwLock::ExclusiveLockScope IndexLock(m_IndexLock);
-					CompactState(Payloads, AccessTimes, MetaDatas, MemCachedPayloads, FirstReferenceIndex, Index, IndexLock);
+					CompactState(IndexLock, Payloads, AccessTimes, MetaDatas, MemCachedPayloads, FirstReferenceIndex, Index, IndexLock);
 				}
 			}
 		}
@@ -1463,6 +1908,10 @@ ZenCacheDiskLayer::CacheBucket::GatherReferences(GcContext& GcCtx)
 			WriteBlockLongestTimeUs = std::max(ElapsedUs, WriteBlockLongestTimeUs);
 		});
 #endif	// CALCULATE_BLOCKING_TIME
+		if (m_Index.empty())
+		{
+			return;
+		}
 		Index				= m_Index;
 		AccessTimes			= m_AccessTimes;
 		Payloads			= m_Payloads;
@@ -1542,10 +1991,9 @@ ZenCacheDiskLayer::CacheBucket::GatherReferences(GcContext& GcCtx)
 
 	for (const auto& Entry : StructuredItemsWithUnknownAttachments)
 	{
-		const IoHash&		Key			 = Entry.first;
-		size_t				PayloadIndex = Entry.second;
-		BucketPayload&		Payload		 = Payloads[PayloadIndex];
-		const DiskLocation& Loc			 = Payload.Location;
+		const IoHash&		Key		= Entry.first;
+		BucketPayload&		Payload = Payloads[Entry.second];
+		const DiskLocation& Loc		= Payload.Location;
 		{
 			IoBuffer Buffer;
 			if (Loc.IsFlagSet(DiskLocation::kStandaloneFile))
@@ -1568,10 +2016,10 @@ ZenCacheDiskLayer::CacheBucket::GatherReferences(GcContext& GcCtx)
 #endif	// CALCULATE_BLOCKING_TIME
 				if (auto It = m_Index.find(Key); It != m_Index.end())
 				{
-					const BucketPayload& CachedPayload = Payloads[PayloadIndex];
+					const BucketPayload& CachedPayload = Payloads[It->second];
 					if (CachedPayload.MemCached)
 					{
-						Buffer = m_MemCachedPayloads[CachedPayload.MemCached];
+						Buffer = m_MemCachedPayloads[CachedPayload.MemCached].Payload;
 						ZEN_ASSERT_SLOW(Buffer);
 					}
 					else
@@ -1678,20 +2126,7 @@ ZenCacheDiskLayer::CacheBucket::CollectGarbage(GcContext& GcCtx)
 
 		try
 		{
-			std::vector<AccessTime>		AccessTimes;
-			std::vector<BucketPayload>	Payloads;
-			std::vector<BucketMetaData> MetaDatas;
-			IndexMap					Index;
-			{
-				RwLock::SharedLockScope IndexLock(m_IndexLock);
-				MakeIndexSnapshot([&]() { return GcCtx.ClaimGCReserve(); });
-				Index		= m_Index;
-				Payloads	= m_Payloads;
-				AccessTimes = m_AccessTimes;
-				MetaDatas	= m_MetaDatas;
-			}
-			SaveManifest(MakeManifest(std::move(Index), std::move(AccessTimes), Payloads, MetaDatas),
-						 [&]() { return GcCtx.ClaimGCReserve(); });
+			SaveSnapshot([&]() { return GcCtx.ClaimGCReserve(); });
 		}
 		catch (std::exception& Ex)
 		{
@@ -1699,8 +2134,6 @@ ZenCacheDiskLayer::CacheBucket::CollectGarbage(GcContext& GcCtx)
 		}
 	});
 
-	m_SlogFile.Flush();
-
 	auto __ = MakeGuard([&]() {
 		if (!DeletedChunks.empty())
 		{
@@ -1708,7 +2141,7 @@ ZenCacheDiskLayer::CacheBucket::CollectGarbage(GcContext& GcCtx)
 			std::vector<BucketPayload>	Payloads;
 			std::vector<AccessTime>		AccessTimes;
 			std::vector<BucketMetaData> MetaDatas;
-			std::vector<IoBuffer>		MemCachedPayloads;
+			std::vector<MemCacheData>	MemCachedPayloads;
 			std::vector<ReferenceIndex> FirstReferenceIndex;
 			IndexMap					Index;
 			{
@@ -1719,18 +2152,25 @@ ZenCacheDiskLayer::CacheBucket::CollectGarbage(GcContext& GcCtx)
 					WriteBlockTimeUs += ElapsedUs;
 					WriteBlockLongestTimeUs = std::max(ElapsedUs, WriteBlockLongestTimeUs);
 				});
-				CompactState(Payloads, AccessTimes, MetaDatas, MemCachedPayloads, FirstReferenceIndex, Index, IndexLock);
+				CompactState(IndexLock, Payloads, AccessTimes, MetaDatas, MemCachedPayloads, FirstReferenceIndex, Index, IndexLock);
 			}
 			GcCtx.AddDeletedCids(std::vector<IoHash>(DeletedChunks.begin(), DeletedChunks.end()));
 		}
 	});
 
-	std::span<const IoHash>					   ExpiredCacheKeySpan = GcCtx.ExpiredCacheKeys(m_BucketDir.string());
+	std::span<const IoHash> ExpiredCacheKeySpan = GcCtx.ExpiredCacheKeys(m_BucketDir.string());
+	if (ExpiredCacheKeySpan.empty())
+	{
+		return;
+	}
+
+	m_SlogFile.Flush();
+
 	std::unordered_set<IoHash, IoHash::Hasher> ExpiredCacheKeys(ExpiredCacheKeySpan.begin(), ExpiredCacheKeySpan.end());
 
 	std::vector<DiskIndexEntry>		 ExpiredStandaloneEntries;
-	IndexMap						 Index;
-	std::vector<BucketPayload>		 Payloads;
+	IndexMap						 IndexSnapshot;
+	std::vector<BucketPayload>		 PayloadsSnapshot;
 	BlockStore::ReclaimSnapshotState BlockStoreState;
 	{
 		bool Expected = false;
@@ -1741,7 +2181,6 @@ ZenCacheDiskLayer::CacheBucket::CollectGarbage(GcContext& GcCtx)
 		}
 		auto FlushingGuard = MakeGuard([&] { m_IsFlushing.store(false); });
 
-		std::vector<AccessTime> AccessTimes;
 		{
 			ZEN_TRACE_CPU("Z$::Disk::Bucket::CollectGarbage::State");
 			RwLock::SharedLockScope IndexLock(m_IndexLock);
@@ -1755,23 +2194,23 @@ ZenCacheDiskLayer::CacheBucket::CollectGarbage(GcContext& GcCtx)
 
 			BlockStoreState = m_BlockStore.GetReclaimSnapshotState();
 
-			Payloads	= m_Payloads;
-			AccessTimes = m_AccessTimes;
-			Index		= m_Index;
-
 			for (const IoHash& Key : ExpiredCacheKeys)
 			{
-				if (auto It = Index.find(Key); It != Index.end())
+				if (auto It = m_Index.find(Key); It != m_Index.end())
 				{
-					const BucketPayload& Payload = Payloads[It->second];
-					DiskIndexEntry		 Entry	 = {.Key = It->first, .Location = Payload.Location};
-					if (Entry.Location.Flags & DiskLocation::kStandaloneFile)
+					const BucketPayload& Payload = m_Payloads[It->second];
+					if (Payload.Location.Flags & DiskLocation::kStandaloneFile)
 					{
+						DiskIndexEntry Entry = {.Key = Key, .Location = Payload.Location};
 						Entry.Location.Flags |= DiskLocation::kTombStone;
 						ExpiredStandaloneEntries.push_back(Entry);
 					}
 				}
 			}
+
+			PayloadsSnapshot = m_Payloads;
+			IndexSnapshot	 = m_Index;
+
 			if (GcCtx.IsDeletionMode())
 			{
 				IndexLock.ReleaseNow();
@@ -1836,7 +2275,7 @@ ZenCacheDiskLayer::CacheBucket::CollectGarbage(GcContext& GcCtx)
 		}
 	}
 
-	TotalChunkCount = Index.size();
+	TotalChunkCount = IndexSnapshot.size();
 
 	std::vector<BlockStoreLocation> ChunkLocations;
 	BlockStore::ChunkIndexArray		KeepChunkIndexes;
@@ -1846,10 +2285,10 @@ ZenCacheDiskLayer::CacheBucket::CollectGarbage(GcContext& GcCtx)
 	ChunkIndexToChunkHash.reserve(TotalChunkCount);
 	{
 		TotalChunkCount = 0;
-		for (const auto& Entry : Index)
+		for (const auto& Entry : IndexSnapshot)
 		{
 			size_t				EntryIndex	 = Entry.second;
-			const DiskLocation& DiskLocation = Payloads[EntryIndex].Location;
+			const DiskLocation& DiskLocation = PayloadsSnapshot[EntryIndex].Location;
 
 			if (DiskLocation.Flags & DiskLocation::kStandaloneFile)
 			{
@@ -1894,7 +2333,7 @@ ZenCacheDiskLayer::CacheBucket::CollectGarbage(GcContext& GcCtx)
 			std::vector<DiskIndexEntry> LogEntries;
 			LogEntries.reserve(MovedChunks.size() + RemovedChunks.size());
 			{
-				RwLock::ExclusiveLockScope __(m_IndexLock);
+				RwLock::ExclusiveLockScope IndexLock(m_IndexLock);
 				Stopwatch				   Timer;
 				const auto				   ____ = MakeGuard([&] {
 					uint64_t ElapsedUs = Timer.GetElapsedTimeUs();
@@ -1908,7 +2347,7 @@ ZenCacheDiskLayer::CacheBucket::CollectGarbage(GcContext& GcCtx)
 					const IoHash&			  ChunkHash	  = ChunkIndexToChunkHash[ChunkIndex];
 					size_t					  EntryIndex  = m_Index[ChunkHash];
 					BucketPayload&			  Payload	  = m_Payloads[EntryIndex];
-					if (Payloads[Index[ChunkHash]].Location != m_Payloads[EntryIndex].Location)
+					if (PayloadsSnapshot[IndexSnapshot[ChunkHash]].Location != m_Payloads[EntryIndex].Location)
 					{
 						// Entry has been updated while GC was running, ignore the move
 						continue;
@@ -1921,7 +2360,7 @@ ZenCacheDiskLayer::CacheBucket::CollectGarbage(GcContext& GcCtx)
 					const IoHash&  ChunkHash  = ChunkIndexToChunkHash[ChunkIndex];
 					size_t		   EntryIndex = m_Index[ChunkHash];
 					BucketPayload& Payload	  = m_Payloads[EntryIndex];
-					if (Payloads[Index[ChunkHash]].Location != Payload.Location)
+					if (PayloadsSnapshot[IndexSnapshot[ChunkHash]].Location != Payload.Location)
 					{
 						// Entry has been updated while GC was running, ignore the delete
 						continue;
@@ -1932,8 +2371,8 @@ ZenCacheDiskLayer::CacheBucket::CollectGarbage(GcContext& GcCtx)
 																   m_Configuration.PayloadAlignment,
 																   OldDiskLocation.GetFlags() | DiskLocation::kTombStone)});
 
-					RemoveMemCachedData(Payload);
-					RemoveMetaData(Payload);
+					RemoveMemCachedData(IndexLock, Payload);
+					RemoveMetaData(IndexLock, Payload);
 
 					m_Index.erase(ChunkHash);
 					DeletedChunks.insert(ChunkHash);
@@ -1970,7 +2409,7 @@ ZenCacheDiskLayer::CacheBucket::EntryCount() const
 }
 
 CacheValueDetails::ValueDetails
-ZenCacheDiskLayer::CacheBucket::GetValueDetails(const IoHash& Key, PayloadIndex Index) const
+ZenCacheDiskLayer::CacheBucket::GetValueDetails(RwLock::SharedLockScope& IndexLock, const IoHash& Key, PayloadIndex Index) const
 {
 	std::vector<IoHash>	 Attachments;
 	const BucketPayload& Payload = m_Payloads[Index];
@@ -1982,7 +2421,7 @@ ZenCacheDiskLayer::CacheBucket::GetValueDetails(const IoHash& Key, PayloadIndex
 		CbObjectView Obj(Value.GetData());
 		Obj.IterateAttachments([&Attachments](CbFieldView Field) { Attachments.emplace_back(Field.AsAttachment()); });
 	}
-	BucketMetaData MetaData = GetMetaData(Payload);
+	BucketMetaData MetaData = GetMetaData(IndexLock, Payload);
 	return CacheValueDetails::ValueDetails{.Size		= Payload.Location.Size(),
 										   .RawSize		= MetaData.RawSize,
 										   .RawHash		= MetaData.RawHash,
@@ -1992,7 +2431,7 @@ ZenCacheDiskLayer::CacheBucket::GetValueDetails(const IoHash& Key, PayloadIndex
 }
 
 CacheValueDetails::BucketDetails
-ZenCacheDiskLayer::CacheBucket::GetValueDetails(const std::string_view ValueFilter) const
+ZenCacheDiskLayer::CacheBucket::GetValueDetails(RwLock::SharedLockScope& IndexLock, const std::string_view ValueFilter) const
 {
 	CacheValueDetails::BucketDetails Details;
 	RwLock::SharedLockScope			 _(m_IndexLock);
@@ -2001,7 +2440,7 @@ ZenCacheDiskLayer::CacheBucket::GetValueDetails(const std::string_view ValueFilt
 		Details.Values.reserve(m_Index.size());
 		for (const auto& It : m_Index)
 		{
-			Details.Values.insert_or_assign(It.first, GetValueDetails(It.first, It.second));
+			Details.Values.insert_or_assign(It.first, GetValueDetails(IndexLock, It.first, It.second));
 		}
 	}
 	else
@@ -2009,7 +2448,7 @@ ZenCacheDiskLayer::CacheBucket::GetValueDetails(const std::string_view ValueFilt
 		IoHash Key = IoHash::FromHexString(ValueFilter);
 		if (auto It = m_Index.find(Key); It != m_Index.end())
 		{
-			Details.Values.insert_or_assign(It->first, GetValueDetails(It->first, It->second));
+			Details.Values.insert_or_assign(It->first, GetValueDetails(IndexLock, It->first, It->second));
 		}
 	}
 	return Details;
@@ -2019,10 +2458,10 @@ void
 ZenCacheDiskLayer::CacheBucket::EnumerateBucketContents(
 	std::function<void(const IoHash& Key, const CacheValueDetails::ValueDetails& Details)>& Fn) const
 {
-	RwLock::SharedLockScope _(m_IndexLock);
+	RwLock::SharedLockScope IndexLock(m_IndexLock);
 	for (const auto& It : m_Index)
 	{
-		CacheValueDetails::ValueDetails Vd = GetValueDetails(It.first, It.second);
+		CacheValueDetails::ValueDetails Vd = GetValueDetails(IndexLock, It.first, It.second);
 
 		Fn(It.first, Vd);
 	}
@@ -2046,7 +2485,10 @@ ZenCacheDiskLayer::CollectGarbage(GcContext& GcCtx)
 	{
 		Bucket->CollectGarbage(GcCtx);
 	}
-	MemCacheTrim(Buckets, GcCtx.CacheExpireTime());
+	if (!m_IsMemCacheTrimming)
+	{
+		MemCacheTrim(Buckets, GcCtx.CacheExpireTime());
+	}
 }
 
 void
@@ -2166,6 +2608,10 @@ ZenCacheDiskLayer::CacheBucket::PutStandaloneCacheValue(const IoHash& HashKey, c
 
 	RwLock::ExclusiveLockScope IndexLock(m_IndexLock);
 	ValueLock.ReleaseNow();
+	if (m_UpdatedKeys)
+	{
+		m_UpdatedKeys->insert(HashKey);
+	}
 
 	PayloadIndex EntryIndex = {};
 	if (auto It = m_Index.find(HashKey); It == m_Index.end())
@@ -2193,16 +2639,16 @@ ZenCacheDiskLayer::CacheBucket::PutStandaloneCacheValue(const IoHash& HashKey, c
 			SetReferences(IndexLock, m_FirstReferenceIndex[EntryIndex], References);
 		}
 		m_AccessTimes[EntryIndex] = GcClock::TickCount();
-		RemoveMemCachedData(Payload);
+		RemoveMemCachedData(IndexLock, Payload);
 		m_StandaloneSize.fetch_sub(OldSize, std::memory_order::relaxed);
 	}
 	if (Value.RawSize != 0 || Value.RawHash != IoHash::Zero)
 	{
-		SetMetaData(m_Payloads[EntryIndex], {.RawSize = Value.RawSize, .RawHash = Value.RawHash});
+		SetMetaData(IndexLock, m_Payloads[EntryIndex], {.RawSize = Value.RawSize, .RawHash = Value.RawHash});
 	}
 	else
 	{
-		RemoveMetaData(m_Payloads[EntryIndex]);
+		RemoveMetaData(IndexLock, m_Payloads[EntryIndex]);
 	}
 
 	m_SlogFile.Append({.Key = HashKey, .Location = Loc});
@@ -2210,7 +2656,9 @@ ZenCacheDiskLayer::CacheBucket::PutStandaloneCacheValue(const IoHash& HashKey, c
 }
 
 void
-ZenCacheDiskLayer::CacheBucket::SetMetaData(BucketPayload& Payload, const ZenCacheDiskLayer::CacheBucket::BucketMetaData& MetaData)
+ZenCacheDiskLayer::CacheBucket::SetMetaData(RwLock::ExclusiveLockScope&,
+											BucketPayload&										  Payload,
+											const ZenCacheDiskLayer::CacheBucket::BucketMetaData& MetaData)
 {
 	if (Payload.MetaData)
 	{
@@ -2233,7 +2681,7 @@ ZenCacheDiskLayer::CacheBucket::SetMetaData(BucketPayload& Payload, const ZenCac
 }
 
 void
-ZenCacheDiskLayer::CacheBucket::RemoveMetaData(BucketPayload& Payload)
+ZenCacheDiskLayer::CacheBucket::RemoveMetaData(RwLock::ExclusiveLockScope&, BucketPayload& Payload)
 {
 	if (Payload.MetaData)
 	{
@@ -2243,17 +2691,18 @@ ZenCacheDiskLayer::CacheBucket::RemoveMetaData(BucketPayload& Payload)
 }
 
 void
-ZenCacheDiskLayer::CacheBucket::SetMemCachedData(BucketPayload& Payload, IoBuffer& MemCachedData)
+ZenCacheDiskLayer::CacheBucket::SetMemCachedData(RwLock::ExclusiveLockScope&, PayloadIndex PayloadIndex, IoBuffer& MemCachedData)
 {
-	uint64_t PayloadSize = MemCachedData.GetSize();
+	BucketPayload& Payload	   = m_Payloads[PayloadIndex];
+	uint64_t	   PayloadSize = MemCachedData.GetSize();
 	ZEN_ASSERT(PayloadSize != 0);
 	if (m_FreeMemCachedPayloads.empty())
 	{
 		if (m_MemCachedPayloads.size() != std::numeric_limits<uint32_t>::max())
 		{
 			Payload.MemCached = MemCachedIndex(gsl::narrow<uint32_t>(m_MemCachedPayloads.size()));
-			m_MemCachedPayloads.push_back(MemCachedData);
-			AddMemCacheUsage(PayloadSize);
+			m_MemCachedPayloads.emplace_back(MemCacheData{.Payload = MemCachedData, .OwnerIndex = PayloadIndex});
+			AddMemCacheUsage(EstimateMemCachePayloadMemory(PayloadSize));
 			m_MemoryWriteCount++;
 		}
 	}
@@ -2261,20 +2710,20 @@ ZenCacheDiskLayer::CacheBucket::SetMemCachedData(BucketPayload& Payload, IoBuffe
 	{
 		Payload.MemCached = m_FreeMemCachedPayloads.back();
 		m_FreeMemCachedPayloads.pop_back();
-		m_MemCachedPayloads[Payload.MemCached] = MemCachedData;
-		AddMemCacheUsage(PayloadSize);
+		m_MemCachedPayloads[Payload.MemCached] = MemCacheData{.Payload = MemCachedData, .OwnerIndex = PayloadIndex};
+		AddMemCacheUsage(EstimateMemCachePayloadMemory(PayloadSize));
 		m_MemoryWriteCount++;
 	}
 }
 
 size_t
-ZenCacheDiskLayer::CacheBucket::RemoveMemCachedData(BucketPayload& Payload)
+ZenCacheDiskLayer::CacheBucket::RemoveMemCachedData(RwLock::ExclusiveLockScope&, BucketPayload& Payload)
 {
 	if (Payload.MemCached)
 	{
-		size_t PayloadSize = m_MemCachedPayloads[Payload.MemCached].GetSize();
-		RemoveMemCacheUsage(PayloadSize);
-		m_MemCachedPayloads[Payload.MemCached] = IoBuffer{};
+		size_t PayloadSize = m_MemCachedPayloads[Payload.MemCached].Payload.GetSize();
+		RemoveMemCacheUsage(EstimateMemCachePayloadMemory(PayloadSize));
+		m_MemCachedPayloads[Payload.MemCached] = {};
 		m_FreeMemCachedPayloads.push_back(Payload.MemCached);
 		Payload.MemCached = {};
 		return PayloadSize;
@@ -2283,7 +2732,7 @@ ZenCacheDiskLayer::CacheBucket::RemoveMemCachedData(BucketPayload& Payload)
 }
 
 ZenCacheDiskLayer::CacheBucket::BucketMetaData
-ZenCacheDiskLayer::CacheBucket::GetMetaData(const BucketPayload& Payload) const
+ZenCacheDiskLayer::CacheBucket::GetMetaData(RwLock::SharedLockScope&, const BucketPayload& Payload) const
 {
 	if (Payload.MetaData)
 	{
@@ -2316,14 +2765,18 @@ ZenCacheDiskLayer::CacheBucket::PutInlineCacheValue(const IoHash& HashKey, const
 								m_SlogFile.Append({.Key = HashKey, .Location = Location});
 
 								RwLock::ExclusiveLockScope IndexLock(m_IndexLock);
+								if (m_UpdatedKeys)
+								{
+									m_UpdatedKeys->insert(HashKey);
+								}
 								if (auto It = m_Index.find(HashKey); It != m_Index.end())
 								{
 									PayloadIndex EntryIndex = It.value();
 									ZEN_ASSERT_SLOW(EntryIndex < PayloadIndex(m_AccessTimes.size()));
 									BucketPayload& Payload = m_Payloads[EntryIndex];
 
-									RemoveMemCachedData(Payload);
-									RemoveMetaData(Payload);
+									RemoveMemCachedData(IndexLock, Payload);
+									RemoveMetaData(IndexLock, Payload);
 
 									Payload					  = (BucketPayload{.Location = Location});
 									m_AccessTimes[EntryIndex] = GcClock::TickCount();
@@ -2354,12 +2807,246 @@ ZenCacheDiskLayer::CacheBucket::GetGcName(GcCtx&)
 	return fmt::format("cachebucket:'{}'", m_BucketDir.string());
 }
 
-void
-ZenCacheDiskLayer::CacheBucket::RemoveExpiredData(GcCtx& Ctx, GcReferencerStats& Stats)
+class DiskBucketStoreCompactor : public GcStoreCompactor
 {
-	size_t									 TotalEntries = 0;
-	tsl::robin_set<IoHash, IoHash::Hasher>	 ExpiredInlineKeys;
-	std::vector<std::pair<IoHash, uint64_t>> ExpiredStandaloneKeys;
+public:
+	DiskBucketStoreCompactor(ZenCacheDiskLayer::CacheBucket& Bucket, std::vector<std::pair<IoHash, uint64_t>>&& ExpiredStandaloneKeys)
+	: m_Bucket(Bucket)
+	, m_ExpiredStandaloneKeys(std::move(ExpiredStandaloneKeys))
+	{
+		m_ExpiredStandaloneKeys.shrink_to_fit();
+	}
+
+	virtual ~DiskBucketStoreCompactor() {}
+
+	virtual void CompactStore(GcCtx& Ctx, GcCompactStoreStats& Stats, const std::function<uint64_t()>& ClaimDiskReserveCallback) override
+	{
+		ZEN_TRACE_CPU("Z$::Disk::Bucket::CompactStore");
+
+		Stopwatch  Timer;
+		const auto _ = MakeGuard([&] {
+			Reset(m_ExpiredStandaloneKeys);
+			if (!Ctx.Settings.Verbose)
+			{
+				return;
+			}
+			ZEN_INFO("GCV2: cachebucket [COMPACT] '{}': RemovedDisk: {} in {}",
+					 m_Bucket.m_BucketDir,
+					 NiceBytes(Stats.RemovedDisk),
+					 NiceTimeSpanMs(Timer.GetElapsedTimeMs()));
+		});
+
+		if (!m_ExpiredStandaloneKeys.empty())
+		{
+			// Compact standalone items
+			size_t					   Skipped = 0;
+			ExtendablePathBuilder<256> Path;
+			for (const std::pair<IoHash, uint64_t>& ExpiredKey : m_ExpiredStandaloneKeys)
+			{
+				if (Ctx.IsCancelledFlag.load())
+				{
+					return;
+				}
+				Path.Reset();
+				m_Bucket.BuildPath(Path, ExpiredKey.first);
+				fs::path FilePath = Path.ToPath();
+
+				RwLock::SharedLockScope IndexLock(m_Bucket.m_IndexLock);
+				if (m_Bucket.m_Index.contains(ExpiredKey.first))
+				{
+					// Someone added it back, let the file on disk be
+					ZEN_DEBUG("GCV2: cachebucket [COMPACT] '{}': skipping z$ delete standalone of file '{}' FAILED, it has been added back",
+							  m_Bucket.m_BucketDir,
+							  Path.ToUtf8());
+					continue;
+				}
+
+				if (Ctx.Settings.IsDeleteMode)
+				{
+					RwLock::ExclusiveLockScope ValueLock(m_Bucket.LockForHash(ExpiredKey.first));
+					IndexLock.ReleaseNow();
+					ZEN_DEBUG("GCV2: cachebucket [COMPACT] '{}': deleting standalone cache file '{}'", m_Bucket.m_BucketDir, Path.ToUtf8());
+
+					std::error_code Ec;
+					if (!fs::remove(FilePath, Ec))
+					{
+						continue;
+					}
+					if (Ec)
+					{
+						ZEN_WARN("GCV2: cachebucket [COMPACT] '{}': delete expired z$ standalone file '{}' FAILED, reason: '{}'",
+								 m_Bucket.m_BucketDir,
+								 Path.ToUtf8(),
+								 Ec.message());
+						continue;
+					}
+					Stats.RemovedDisk += ExpiredKey.second;
+				}
+				else
+				{
+					RwLock::SharedLockScope ValueLock(m_Bucket.LockForHash(ExpiredKey.first));
+					IndexLock.ReleaseNow();
+					ZEN_DEBUG("GCV2: cachebucket [COMPACT] '{}': checking standalone cache file '{}'", m_Bucket.m_BucketDir, Path.ToUtf8());
+
+					std::error_code Ec;
+					bool			Existed = std::filesystem::is_regular_file(FilePath, Ec);
+					if (Ec)
+					{
+						ZEN_WARN("GCV2: cachebucket [COMPACT] '{}': failed checking cache payload file '{}'. Reason '{}'",
+								 m_Bucket.m_BucketDir,
+								 FilePath,
+								 Ec.message());
+						continue;
+					}
+					if (!Existed)
+					{
+						continue;
+					}
+					Skipped++;
+				}
+			}
+			if (Skipped > 0)
+			{
+				ZEN_DEBUG("GCV2: cachebucket [COMPACT] '{}': skipped deleting of {} eligible files", m_Bucket.m_BucketDir, Skipped);
+			}
+		}
+
+		if (Ctx.Settings.CollectSmallObjects)
+		{
+			m_Bucket.m_IndexLock.WithExclusiveLock([&]() { m_Bucket.m_UpdatedKeys = std::make_unique<HashSet>(); });
+			auto __ = MakeGuard([&]() { m_Bucket.m_IndexLock.WithExclusiveLock([&]() { m_Bucket.m_UpdatedKeys.reset(); }); });
+
+			size_t					  InlineEntryCount = 0;
+			BlockStore::BlockUsageMap BlockUsage;
+			{
+				RwLock::SharedLockScope ___(m_Bucket.m_IndexLock);
+				for (const auto& Entry : m_Bucket.m_Index)
+				{
+					ZenCacheDiskLayer::CacheBucket::PayloadIndex		 Index	 = Entry.second;
+					const ZenCacheDiskLayer::CacheBucket::BucketPayload& Payload = m_Bucket.m_Payloads[Index];
+					const DiskLocation&									 Loc	 = Payload.Location;
+
+					if (Loc.IsFlagSet(DiskLocation::kStandaloneFile))
+					{
+						continue;
+					}
+					InlineEntryCount++;
+					uint32_t BlockIndex = Loc.Location.BlockLocation.GetBlockIndex();
+					uint64_t ChunkSize	= RoundUp(Loc.Size(), m_Bucket.m_Configuration.PayloadAlignment);
+					if (auto It = BlockUsage.find(BlockIndex); It != BlockUsage.end())
+					{
+						It->second.EntryCount++;
+						It->second.DiskUsage += ChunkSize;
+					}
+					else
+					{
+						BlockUsage.insert_or_assign(BlockIndex, BlockStore::BlockUsageInfo{.DiskUsage = ChunkSize, .EntryCount = 1});
+					}
+				}
+			}
+
+			{
+				BlockStoreCompactState BlockCompactState;
+				std::vector<IoHash>	   BlockCompactStateKeys;
+				BlockCompactStateKeys.reserve(InlineEntryCount);
+
+				BlockStore::BlockEntryCountMap BlocksToCompact =
+					m_Bucket.m_BlockStore.GetBlocksToCompact(BlockUsage, Ctx.Settings.CompactBlockUsageThresholdPercent);
+				BlockCompactState.IncludeBlocks(BlocksToCompact);
+
+				if (BlocksToCompact.size() > 0)
+				{
+					{
+						RwLock::SharedLockScope ___(m_Bucket.m_IndexLock);
+						for (const auto& Entry : m_Bucket.m_Index)
+						{
+							ZenCacheDiskLayer::CacheBucket::PayloadIndex		 Index	 = Entry.second;
+							const ZenCacheDiskLayer::CacheBucket::BucketPayload& Payload = m_Bucket.m_Payloads[Index];
+							const DiskLocation&									 Loc	 = Payload.Location;
+
+							if (Loc.IsFlagSet(DiskLocation::kStandaloneFile))
+							{
+								continue;
+							}
+							if (!BlockCompactState.AddKeepLocation(Loc.GetBlockLocation(m_Bucket.m_Configuration.PayloadAlignment)))
+							{
+								continue;
+							}
+							BlockCompactStateKeys.push_back(Entry.first);
+						}
+					}
+
+					if (Ctx.Settings.IsDeleteMode)
+					{
+						if (Ctx.Settings.Verbose)
+						{
+							ZEN_INFO("GCV2: cachebucket [COMPACT] '{}': compacting {} blocks",
+									 m_Bucket.m_BucketDir,
+									 BlocksToCompact.size());
+						}
+
+						m_Bucket.m_BlockStore.CompactBlocks(
+							BlockCompactState,
+							m_Bucket.m_Configuration.PayloadAlignment,
+							[&](const BlockStore::MovedChunksArray& MovedArray, uint64_t FreedDiskSpace) {
+								std::vector<DiskIndexEntry> MovedEntries;
+								MovedEntries.reserve(MovedArray.size());
+								RwLock::ExclusiveLockScope _(m_Bucket.m_IndexLock);
+								for (const std::pair<size_t, BlockStoreLocation>& Moved : MovedArray)
+								{
+									size_t		  ChunkIndex = Moved.first;
+									const IoHash& Key		 = BlockCompactStateKeys[ChunkIndex];
+
+									if (m_Bucket.m_UpdatedKeys->contains(Key))
+									{
+										continue;
+									}
+
+									if (auto It = m_Bucket.m_Index.find(Key); It != m_Bucket.m_Index.end())
+									{
+										ZenCacheDiskLayer::CacheBucket::BucketPayload& Payload	   = m_Bucket.m_Payloads[It->second];
+										const BlockStoreLocation&					   NewLocation = Moved.second;
+										Payload.Location										   = DiskLocation(NewLocation,
+																		  m_Bucket.m_Configuration.PayloadAlignment,
+																		  Payload.Location.GetFlags());
+										MovedEntries.push_back({.Key = Key, .Location = Payload.Location});
+									}
+								}
+								m_Bucket.m_SlogFile.Append(MovedEntries);
+								Stats.RemovedDisk += FreedDiskSpace;
+								if (Ctx.IsCancelledFlag.load())
+								{
+									return false;
+								}
+								return true;
+							},
+							ClaimDiskReserveCallback);
+					}
+					else
+					{
+						if (Ctx.Settings.Verbose)
+						{
+							ZEN_INFO("GCV2: cachebucket [COMPACT] '{}': skipped compacting of {} eligible blocks",
+									 m_Bucket.m_BucketDir,
+									 BlocksToCompact.size());
+						}
+					}
+				}
+			}
+		}
+	}
+
+private:
+	ZenCacheDiskLayer::CacheBucket&			 m_Bucket;
+	std::vector<std::pair<IoHash, uint64_t>> m_ExpiredStandaloneKeys;
+};
+
+GcStoreCompactor*
+ZenCacheDiskLayer::CacheBucket::RemoveExpiredData(GcCtx& Ctx, GcStats& Stats)
+{
+	ZEN_TRACE_CPU("Z$::Disk::Bucket::RemoveExpiredData");
+
+	size_t TotalEntries = 0;
 
 	Stopwatch  Timer;
 	const auto _ = MakeGuard([&] {
@@ -2367,36 +3054,38 @@ ZenCacheDiskLayer::CacheBucket::RemoveExpiredData(GcCtx& Ctx, GcReferencerStats&
 		{
 			return;
 		}
-		ZEN_INFO("GCV2: cachebucket [REMOVE EXPIRED] '{}': Count: {}, Expired: {}, Deleted: {}, RemovedDisk: {}, RemovedMemory: {} in {}",
+		ZEN_INFO("GCV2: cachebucket [REMOVE EXPIRED] '{}': Count: {}, Expired: {}, Deleted: {}, FreedMemory: {} in {}",
 				 m_BucketDir,
-				 Stats.Count,
-				 Stats.Expired,
-				 Stats.Deleted,
-				 NiceBytes(Stats.RemovedDisk),
-				 NiceBytes(Stats.RemovedMemory),
+				 Stats.CheckedCount,
+				 Stats.FoundCount,
+				 Stats.DeletedCount,
+				 NiceBytes(Stats.FreedMemory),
 				 NiceTimeSpanMs(Timer.GetElapsedTimeMs()));
 	});
 
 	const GcClock::Tick ExpireTicks = Ctx.Settings.CacheExpireTime.time_since_epoch().count();
 
-	BlockStoreCompactState			 BlockCompactState;
-	BlockStore::ReclaimSnapshotState BlockSnapshotState;
-	std::vector<IoHash>				 BlockCompactStateKeys;
-	std::vector<DiskIndexEntry>		 ExpiredEntries;
-	uint64_t						 RemovedStandaloneSize = 0;
+	std::vector<DiskIndexEntry>				 ExpiredEntries;
+	std::vector<std::pair<IoHash, uint64_t>> ExpiredStandaloneKeys;
+	uint64_t								 RemovedStandaloneSize = 0;
 	{
 		RwLock::ExclusiveLockScope IndexLock(m_IndexLock);
-		if (Ctx.Settings.CollectSmallObjects)
+		if (Ctx.IsCancelledFlag.load())
+		{
+			return nullptr;
+		}
+		if (m_Index.empty())
 		{
-			BlockSnapshotState = m_BlockStore.GetReclaimSnapshotState();
+			return nullptr;
 		}
+
 		TotalEntries = m_Index.size();
 
-		// Find out expired keys and affected blocks
+		// Find out expired keys
 		for (const auto& Entry : m_Index)
 		{
 			const IoHash& Key		 = Entry.first;
-			size_t		  EntryIndex = Entry.second;
+			PayloadIndex  EntryIndex = Entry.second;
 			GcClock::Tick AccessTime = m_AccessTimes[EntryIndex];
 			if (AccessTime >= ExpireTicks)
 			{
@@ -2415,40 +3104,16 @@ ZenCacheDiskLayer::CacheBucket::RemoveExpiredData(GcCtx& Ctx, GcReferencerStats&
 			}
 			else if (Ctx.Settings.CollectSmallObjects)
 			{
-				ExpiredInlineKeys.insert(Key);
-				uint32_t BlockIndex			= Payload.Location.Location.BlockLocation.GetBlockIndex();
-				bool	 IsActiveWriteBlock = BlockSnapshotState.m_ActiveWriteBlocks.contains(BlockIndex);
-				if (!IsActiveWriteBlock)
-				{
-					BlockCompactState.IncludeBlock(BlockIndex);
-				}
 				ExpiredEntries.push_back(ExpiredEntry);
 			}
 		}
 
-		Stats.Expired += ExpiredStandaloneKeys.size() + ExpiredInlineKeys.size();
+		Stats.CheckedCount += TotalEntries;
+		Stats.FoundCount += ExpiredEntries.size();
 
-		// Get all locations we need to keep for affected blocks
-		if (Ctx.Settings.CollectSmallObjects && !ExpiredInlineKeys.empty())
+		if (Ctx.IsCancelledFlag.load())
 		{
-			for (const auto& Entry : m_Index)
-			{
-				const IoHash& Key = Entry.first;
-				if (ExpiredInlineKeys.contains(Key))
-				{
-					continue;
-				}
-				size_t				 EntryIndex = Entry.second;
-				const BucketPayload& Payload	= m_Payloads[EntryIndex];
-				if (Payload.Location.Flags & DiskLocation::kStandaloneFile)
-				{
-					continue;
-				}
-				if (BlockCompactState.AddKeepLocation(Payload.Location.GetBlockLocation(m_Configuration.PayloadAlignment)))
-				{
-					BlockCompactStateKeys.push_back(Key);
-				}
-			}
+			return nullptr;
 		}
 
 		if (Ctx.Settings.IsDeleteMode)
@@ -2458,132 +3123,291 @@ ZenCacheDiskLayer::CacheBucket::RemoveExpiredData(GcCtx& Ctx, GcReferencerStats&
 				auto It = m_Index.find(Entry.Key);
 				ZEN_ASSERT(It != m_Index.end());
 				BucketPayload& Payload = m_Payloads[It->second];
-				RemoveMetaData(Payload);
-				Stats.RemovedMemory += RemoveMemCachedData(Payload);
+				RemoveMetaData(IndexLock, Payload);
+				Stats.FreedMemory += RemoveMemCachedData(IndexLock, Payload);
 				m_Index.erase(It);
+				Stats.DeletedCount++;
 			}
 			m_SlogFile.Append(ExpiredEntries);
 			m_StandaloneSize.fetch_sub(RemovedStandaloneSize, std::memory_order::relaxed);
 		}
 	}
-	Stats.Count += TotalEntries;
 
-	if (ExpiredEntries.empty())
+	if (Ctx.Settings.IsDeleteMode && !ExpiredEntries.empty())
 	{
-		return;
+		std::vector<BucketPayload>	Payloads;
+		std::vector<AccessTime>		AccessTimes;
+		std::vector<BucketMetaData> MetaDatas;
+		std::vector<MemCacheData>	MemCachedPayloads;
+		std::vector<ReferenceIndex> FirstReferenceIndex;
+		IndexMap					Index;
+		{
+			RwLock::ExclusiveLockScope IndexLock(m_IndexLock);
+			CompactState(IndexLock, Payloads, AccessTimes, MetaDatas, MemCachedPayloads, FirstReferenceIndex, Index, IndexLock);
+		}
 	}
 
-	if (!Ctx.Settings.IsDeleteMode)
+	if (Ctx.IsCancelledFlag.load())
 	{
-		return;
+		return nullptr;
 	}
 
-	Stats.Deleted += ExpiredEntries.size();
-
-	// Compact standalone items
-	ExtendablePathBuilder<256> Path;
-	for (const std::pair<IoHash, uint64_t>& ExpiredKey : ExpiredStandaloneKeys)
-	{
-		Path.Reset();
-		BuildPath(Path, ExpiredKey.first);
-		fs::path FilePath = Path.ToPath();
+	return new DiskBucketStoreCompactor(*this, std::move(ExpiredStandaloneKeys));
+}
 
-		RwLock::SharedLockScope IndexLock(m_IndexLock);
-		if (m_Index.contains(ExpiredKey.first))
-		{
-			// Someone added it back, let the file on disk be
-			ZEN_DEBUG("gc cache bucket '{}': skipping z$ delete standalone of file '{}' FAILED, it has been added back",
-					  m_BucketDir,
-					  Path.ToUtf8());
-			continue;
-		}
+class DiskBucketReferenceChecker : public GcReferenceChecker
+{
+	using PayloadIndex	 = ZenCacheDiskLayer::CacheBucket::PayloadIndex;
+	using BucketPayload	 = ZenCacheDiskLayer::CacheBucket::BucketPayload;
+	using CacheBucket	 = ZenCacheDiskLayer::CacheBucket;
+	using ReferenceIndex = ZenCacheDiskLayer::CacheBucket::ReferenceIndex;
 
-		RwLock::ExclusiveLockScope ValueLock(LockForHash(ExpiredKey.first));
-		IndexLock.ReleaseNow();
-		ZEN_DEBUG("gc cache bucket '{}': deleting standalone cache file '{}'", m_BucketDir, Path.ToUtf8());
+public:
+	DiskBucketReferenceChecker(CacheBucket& Owner) : m_CacheBucket(Owner) {}
 
-		std::error_code Ec;
-		if (!fs::remove(FilePath, Ec))
+	virtual ~DiskBucketReferenceChecker()
+	{
+		try
 		{
-			continue;
+			m_IndexLock.reset();
+			if (!m_CacheBucket.m_Configuration.EnableReferenceCaching)
+			{
+				m_CacheBucket.m_IndexLock.WithExclusiveLock([&]() { m_CacheBucket.m_UpdatedKeys.reset(); });
+				// If reference caching is not enabled, we temporarily used the data structure for reference caching, lets reset it
+				m_CacheBucket.ClearReferenceCache();
+			}
 		}
-		if (Ec)
+		catch (std::exception& Ex)
 		{
-			ZEN_WARN("gc cache bucket '{}': delete expired z$ standalone file '{}' FAILED, reason: '{}'",
-					 m_BucketDir,
-					 Path.ToUtf8(),
-					 Ec.message());
-			continue;
+			ZEN_ERROR("~DiskBucketReferenceChecker threw exception: '{}'", Ex.what());
 		}
-		Stats.RemovedDisk += ExpiredKey.second;
 	}
 
-	if (Ctx.Settings.CollectSmallObjects && !ExpiredInlineKeys.empty())
+	virtual void PreCache(GcCtx& Ctx) override
 	{
-		// Compact block store
-		m_BlockStore.CompactBlocks(
-			BlockCompactState,
-			m_Configuration.PayloadAlignment,
-			[&](const BlockStore::MovedChunksArray& MovedArray, uint64_t FreedDiskSpace) {
-				std::vector<DiskIndexEntry> MovedEntries;
-				RwLock::ExclusiveLockScope	_(m_IndexLock);
-				for (const std::pair<size_t, BlockStoreLocation>& Moved : MovedArray)
-				{
-					size_t		  ChunkIndex = Moved.first;
-					const IoHash& Key		 = BlockCompactStateKeys[ChunkIndex];
+		ZEN_TRACE_CPU("Z$::Disk::Bucket::PreCache");
 
-					if (auto It = m_Index.find(Key); It != m_Index.end())
+		Stopwatch  Timer;
+		const auto _ = MakeGuard([&] {
+			if (!Ctx.Settings.Verbose)
+			{
+				return;
+			}
+			ZEN_INFO("GCV2: cachebucket [PRECACHE] '{}': found {} references in {}",
+					 m_CacheBucket.m_BucketDir,
+					 m_CacheBucket.m_ReferenceCount,
+					 NiceTimeSpanMs(Timer.GetElapsedTimeMs()));
+		});
+
+		std::vector<IoHash> UpdateKeys;
+		std::vector<size_t> ReferenceCounts;
+		std::vector<IoHash> References;
+
+		auto GetAttachments = [&References, &ReferenceCounts](const void* CbObjectData) {
+			size_t		 CurrentReferenceCount = References.size();
+			CbObjectView Obj(CbObjectData);
+			Obj.IterateAttachments([&References](CbFieldView Field) { References.emplace_back(Field.AsAttachment()); });
+			ReferenceCounts.push_back(References.size() - CurrentReferenceCount);
+		};
+
+		// Refresh cache
+		{
+			// If reference caching is enabled the references will be updated at modification for us so we don't need to track modifications
+			if (!m_CacheBucket.m_Configuration.EnableReferenceCaching)
+			{
+				m_CacheBucket.m_IndexLock.WithExclusiveLock([&]() { m_CacheBucket.m_UpdatedKeys = std::make_unique<HashSet>(); });
+			}
+
+			std::vector<IoHash> StandaloneKeys;
+			{
+				std::vector<IoHash>						  InlineKeys;
+				std::unordered_map<uint32_t, std::size_t> BlockIndexToEntriesPerBlockIndex;
+				struct InlineEntry
+				{
+					uint32_t InlineKeyIndex;
+					uint32_t Offset;
+					uint32_t Size;
+				};
+				std::vector<std::vector<InlineEntry>> EntriesPerBlock;
+				size_t								  UpdateCount = 0;
+				{
+					RwLock::SharedLockScope IndexLock(m_CacheBucket.m_IndexLock);
+					for (const auto& Entry : m_CacheBucket.m_Index)
 					{
-						BucketPayload&			  Payload	  = m_Payloads[It->second];
-						const BlockStoreLocation& OldLocation = BlockCompactState.GetLocation(ChunkIndex);
-						if (Payload.Location.GetBlockLocation(m_Configuration.PayloadAlignment) != OldLocation)
+						if (Ctx.IsCancelledFlag.load())
+						{
+							IndexLock.ReleaseNow();
+							m_CacheBucket.m_IndexLock.WithExclusiveLock([&]() { m_CacheBucket.m_UpdatedKeys.reset(); });
+							return;
+						}
+
+						PayloadIndex		 EntryIndex = Entry.second;
+						const BucketPayload& Payload	= m_CacheBucket.m_Payloads[EntryIndex];
+						const DiskLocation&	 Loc		= Payload.Location;
+
+						if (!Loc.IsFlagSet(DiskLocation::kStructured))
+						{
+							continue;
+						}
+						if (m_CacheBucket.m_Configuration.EnableReferenceCaching &&
+							m_CacheBucket.m_FirstReferenceIndex[EntryIndex] != ReferenceIndex::Unknown())
+						{
+							continue;
+						}
+						UpdateCount++;
+						const IoHash& Key = Entry.first;
+						if (Loc.IsFlagSet(DiskLocation::kStandaloneFile))
 						{
-							// Someone has moved our chunk so lets just skip the new location we were provided, it will be GC:d at a later
-							// time
+							StandaloneKeys.push_back(Key);
 							continue;
 						}
 
-						const BlockStoreLocation& NewLocation = Moved.second;
+						BlockStoreLocation ChunkLocation = Loc.GetBlockLocation(m_CacheBucket.m_Configuration.PayloadAlignment);
+						InlineEntry		   UpdateEntry	 = {.InlineKeyIndex = gsl::narrow<uint32_t>(InlineKeys.size()),
+															.Offset			= gsl::narrow<uint32_t>(ChunkLocation.Offset),
+															.Size			= gsl::narrow<uint32_t>(ChunkLocation.Size)};
+						InlineKeys.push_back(Key);
 
-						Payload.Location = DiskLocation(NewLocation, m_Configuration.PayloadAlignment, Payload.Location.GetFlags());
-						MovedEntries.push_back({.Key = Key, .Location = Payload.Location});
+						if (auto It = BlockIndexToEntriesPerBlockIndex.find(ChunkLocation.BlockIndex);
+							It != BlockIndexToEntriesPerBlockIndex.end())
+						{
+							EntriesPerBlock[It->second].emplace_back(UpdateEntry);
+						}
+						else
+						{
+							BlockIndexToEntriesPerBlockIndex.insert_or_assign(ChunkLocation.BlockIndex, EntriesPerBlock.size());
+							EntriesPerBlock.emplace_back(std::vector<InlineEntry>{UpdateEntry});
+						}
 					}
 				}
-				m_SlogFile.Append(MovedEntries);
-				Stats.RemovedDisk += FreedDiskSpace;
-			},
-			[&]() { return 0; });
-	}
 
-	std::vector<BucketPayload>	Payloads;
-	std::vector<AccessTime>		AccessTimes;
-	std::vector<BucketMetaData> MetaDatas;
-	std::vector<IoBuffer>		MemCachedPayloads;
-	std::vector<ReferenceIndex> FirstReferenceIndex;
-	IndexMap					Index;
-	{
-		RwLock::ExclusiveLockScope IndexLock(m_IndexLock);
-		CompactState(Payloads, AccessTimes, MetaDatas, MemCachedPayloads, FirstReferenceIndex, Index, IndexLock);
-	}
-}
+				UpdateKeys.reserve(UpdateCount);
 
-class DiskBucketReferenceChecker : public GcReferenceChecker
-{
-public:
-	DiskBucketReferenceChecker(ZenCacheDiskLayer::CacheBucket& Owner) : m_CacheBucket(Owner) {}
+				for (auto It : BlockIndexToEntriesPerBlockIndex)
+				{
+					uint32_t BlockIndex = It.first;
+
+					Ref<BlockStoreFile> BlockFile = m_CacheBucket.m_BlockStore.GetBlockFile(BlockIndex);
+					if (BlockFile)
+					{
+						size_t					  EntriesPerBlockIndex = It.second;
+						std::vector<InlineEntry>& InlineEntries		   = EntriesPerBlock[EntriesPerBlockIndex];
+
+						std::sort(InlineEntries.begin(), InlineEntries.end(), [&](const InlineEntry& Lhs, const InlineEntry& Rhs) -> bool {
+							return Lhs.Offset < Rhs.Offset;
+						});
+
+						uint64_t		BlockFileSize = BlockFile->FileSize();
+						BasicFileBuffer BlockBuffer(BlockFile->GetBasicFile(), 32768);
+						for (const InlineEntry& InlineEntry : InlineEntries)
+						{
+							if ((InlineEntry.Offset + InlineEntry.Size) > BlockFileSize)
+							{
+								ReferenceCounts.push_back(0);
+							}
+							else
+							{
+								MemoryView ChunkView = BlockBuffer.MakeView(InlineEntry.Size, InlineEntry.Offset);
+								if (ChunkView.GetSize() == InlineEntry.Size)
+								{
+									GetAttachments(ChunkView.GetData());
+								}
+								else
+								{
+									std::vector<uint8_t> Buffer(InlineEntry.Size);
+									BlockBuffer.Read(Buffer.data(), InlineEntry.Size, InlineEntry.Offset);
+									GetAttachments(Buffer.data());
+								}
+							}
+							const IoHash& Key = InlineKeys[InlineEntry.InlineKeyIndex];
+							UpdateKeys.push_back(Key);
+						}
+					}
+				}
+			}
+			{
+				for (const IoHash& Key : StandaloneKeys)
+				{
+					if (Ctx.IsCancelledFlag.load())
+					{
+						m_CacheBucket.m_IndexLock.WithExclusiveLock([&]() { m_CacheBucket.m_UpdatedKeys.reset(); });
+						return;
+					}
+
+					IoBuffer Buffer = m_CacheBucket.GetStandaloneCacheValue(ZenContentType::kCbObject, Key);
+					if (!Buffer)
+					{
+						continue;
+					}
+
+					GetAttachments(Buffer.GetData());
+					UpdateKeys.push_back(Key);
+				}
+			}
+		}
 
-	virtual ~DiskBucketReferenceChecker()
-	{
-		m_IndexLock.reset();
-		if (!m_CacheBucket.m_Configuration.EnableReferenceCaching)
 		{
-			// If reference caching is not enabled, we temporarily used the data structure for reference caching, lets reset it
-			m_CacheBucket.ClearReferenceCache();
+			size_t					   ReferenceOffset = 0;
+			RwLock::ExclusiveLockScope IndexLock(m_CacheBucket.m_IndexLock);
+
+			if (!m_CacheBucket.m_Configuration.EnableReferenceCaching)
+			{
+				ZEN_ASSERT(m_CacheBucket.m_FirstReferenceIndex.empty());
+				ZEN_ASSERT(m_CacheBucket.m_ReferenceHashes.empty());
+				ZEN_ASSERT(m_CacheBucket.m_NextReferenceHashesIndexes.empty());
+				ZEN_ASSERT(m_CacheBucket.m_ReferenceCount == 0);
+				ZEN_ASSERT(m_CacheBucket.m_UpdatedKeys);
+
+				// If reference caching is not enabled, we will resize and use the data structure in place for reference caching when
+				// we figure out what this bucket references. This will be reset once the DiskBucketReferenceChecker is deleted.
+				m_CacheBucket.m_FirstReferenceIndex.resize(m_CacheBucket.m_Payloads.size(), ReferenceIndex::Unknown());
+				m_CacheBucket.m_ReferenceHashes.reserve(References.size());
+				m_CacheBucket.m_NextReferenceHashesIndexes.reserve(References.size());
+			}
+			else
+			{
+				ZEN_ASSERT(!m_CacheBucket.m_UpdatedKeys);
+			}
+
+			for (size_t Index = 0; Index < UpdateKeys.size(); Index++)
+			{
+				const IoHash& Key			 = UpdateKeys[Index];
+				size_t		  ReferenceCount = ReferenceCounts[Index];
+				if (auto It = m_CacheBucket.m_Index.find(Key); It != m_CacheBucket.m_Index.end())
+				{
+					PayloadIndex EntryIndex = It->second;
+					if (m_CacheBucket.m_Configuration.EnableReferenceCaching)
+					{
+						if (m_CacheBucket.m_FirstReferenceIndex[EntryIndex] != ReferenceIndex::Unknown())
+						{
+							// The reference data is valid and what we have is old/redundant
+							continue;
+						}
+					}
+					else if (m_CacheBucket.m_UpdatedKeys->contains(Key))
+					{
+						// Our pre-cache data is invalid
+						continue;
+					}
+
+					m_CacheBucket.SetReferences(IndexLock,
+												m_CacheBucket.m_FirstReferenceIndex[EntryIndex],
+												std::span<IoHash>{References.data() + ReferenceOffset, ReferenceCount});
+				}
+				ReferenceOffset += ReferenceCount;
+			}
+
+			if (m_CacheBucket.m_Configuration.EnableReferenceCaching && !UpdateKeys.empty())
+			{
+				m_CacheBucket.CompactReferences(IndexLock);
+			}
 		}
 	}
 
 	virtual void LockState(GcCtx& Ctx) override
 	{
+		ZEN_TRACE_CPU("Z$::Disk::Bucket::LockState");
+
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
 			if (!Ctx.Settings.Verbose)
@@ -2597,22 +3421,42 @@ public:
 		});
 
 		m_IndexLock = std::make_unique<RwLock::SharedLockScope>(m_CacheBucket.m_IndexLock);
-
-		// Rescan to see if any cache items needs refreshing since last pass when we had the lock
-		for (const auto& Entry : m_CacheBucket.m_Index)
+		if (Ctx.IsCancelledFlag.load())
 		{
-			size_t												 PayloadIndex = Entry.second;
-			const ZenCacheDiskLayer::CacheBucket::BucketPayload& Payload	  = m_CacheBucket.m_Payloads[PayloadIndex];
-			const DiskLocation&									 Loc		  = Payload.Location;
+			m_UncachedReferences.clear();
+			m_IndexLock.reset();
+			m_CacheBucket.m_IndexLock.WithExclusiveLock([&]() { m_CacheBucket.m_UpdatedKeys.reset(); });
+			return;
+		}
 
-			if (!Loc.IsFlagSet(DiskLocation::kStructured))
-			{
-				continue;
-			}
-			ZEN_ASSERT(!m_CacheBucket.m_FirstReferenceIndex.empty());
-			const IoHash& Key = Entry.first;
-			if (m_CacheBucket.m_FirstReferenceIndex[PayloadIndex] == ZenCacheDiskLayer::CacheBucket::ReferenceIndex::Unknown())
+		if (m_CacheBucket.m_UpdatedKeys)
+		{
+			const HashSet& UpdatedKeys(*m_CacheBucket.m_UpdatedKeys);
+			for (const IoHash& Key : UpdatedKeys)
 			{
+				if (Ctx.IsCancelledFlag.load())
+				{
+					m_UncachedReferences.clear();
+					m_IndexLock.reset();
+					m_CacheBucket.m_IndexLock.WithExclusiveLock([&]() { m_CacheBucket.m_UpdatedKeys.reset(); });
+					return;
+				}
+
+				auto It = m_CacheBucket.m_Index.find(Key);
+				if (It == m_CacheBucket.m_Index.end())
+				{
+					continue;
+				}
+
+				PayloadIndex		 EntryIndex = It->second;
+				const BucketPayload& Payload	= m_CacheBucket.m_Payloads[EntryIndex];
+				const DiskLocation&	 Loc		= Payload.Location;
+
+				if (!Loc.IsFlagSet(DiskLocation::kStructured))
+				{
+					continue;
+				}
+
 				IoBuffer Buffer;
 				if (Loc.IsFlagSet(DiskLocation::kStandaloneFile))
 				{
@@ -2633,21 +3477,48 @@ public:
 		}
 	}
 
-	virtual void RemoveUsedReferencesFromSet(GcCtx&, HashSet& IoCids) override
+	virtual void RemoveUsedReferencesFromSet(GcCtx& Ctx, HashSet& IoCids) override
 	{
+		ZEN_TRACE_CPU("Z$::Disk::Bucket::RemoveUsedReferencesFromSet");
+
 		ZEN_ASSERT(m_IndexLock);
+		size_t	   InitialCount = IoCids.size();
+		Stopwatch  Timer;
+		const auto _ = MakeGuard([&] {
+			if (!Ctx.Settings.Verbose)
+			{
+				return;
+			}
+			ZEN_INFO("GCV2: cachebucket [FILTER REFERENCES] '{}': filtered out {} used references out of {} in {}",
+					 m_CacheBucket.m_BucketDir,
+					 InitialCount - IoCids.size(),
+					 InitialCount,
+					 NiceTimeSpanMs(Timer.GetElapsedTimeMs()));
+		});
 
 		for (const IoHash& ReferenceHash : m_CacheBucket.m_ReferenceHashes)
 		{
-			IoCids.erase(ReferenceHash);
+			if (IoCids.erase(ReferenceHash) == 1)
+			{
+				if (IoCids.empty())
+				{
+					return;
+				}
+			}
 		}
 
 		for (const IoHash& ReferenceHash : m_UncachedReferences)
 		{
-			IoCids.erase(ReferenceHash);
+			if (IoCids.erase(ReferenceHash) == 1)
+			{
+				if (IoCids.empty())
+				{
+					return;
+				}
+			}
 		}
 	}
-	ZenCacheDiskLayer::CacheBucket&			 m_CacheBucket;
+	CacheBucket&							 m_CacheBucket;
 	std::unique_ptr<RwLock::SharedLockScope> m_IndexLock;
 	HashSet									 m_UncachedReferences;
 };
@@ -2655,119 +3526,22 @@ public:
 std::vector<GcReferenceChecker*>
 ZenCacheDiskLayer::CacheBucket::CreateReferenceCheckers(GcCtx& Ctx)
 {
+	ZEN_TRACE_CPU("Z$::Disk::Bucket::CreateReferenceCheckers");
+
 	Stopwatch  Timer;
 	const auto _ = MakeGuard([&] {
 		if (!Ctx.Settings.Verbose)
 		{
 			return;
 		}
-		ZEN_INFO("GCV2: cachebucket [CREATE CHECKERS] '{}': found {} references in {}",
-				 m_BucketDir,
-				 m_ReferenceCount,
-				 NiceTimeSpanMs(Timer.GetElapsedTimeMs()));
+		ZEN_INFO("GCV2: cachebucket [CREATE CHECKERS] '{}': completed in {}", m_BucketDir, NiceTimeSpanMs(Timer.GetElapsedTimeMs()));
 	});
 
-	std::vector<IoHash> UpdateKeys;
-	std::vector<IoHash> StandaloneKeys;
-	std::vector<size_t> ReferenceCounts;
-	std::vector<IoHash> References;
-
-	// Refresh cache
-	{
-		RwLock::SharedLockScope IndexLock(m_IndexLock);
-		for (const auto& Entry : m_Index)
-		{
-			size_t												 PayloadIndex = Entry.second;
-			const ZenCacheDiskLayer::CacheBucket::BucketPayload& Payload	  = m_Payloads[PayloadIndex];
-			const DiskLocation&									 Loc		  = Payload.Location;
-
-			if (!Loc.IsFlagSet(DiskLocation::kStructured))
-			{
-				continue;
-			}
-			if (m_Configuration.EnableReferenceCaching &&
-				m_FirstReferenceIndex[PayloadIndex] != ZenCacheDiskLayer::CacheBucket::ReferenceIndex::Unknown())
-			{
-				continue;
-			}
-			const IoHash& Key = Entry.first;
-			if (Loc.IsFlagSet(DiskLocation::kStandaloneFile))
-			{
-				StandaloneKeys.push_back(Key);
-				continue;
-			}
-			IoBuffer Buffer = GetInlineCacheValue(Loc);
-			if (!Buffer)
-			{
-				UpdateKeys.push_back(Key);
-				ReferenceCounts.push_back(0);
-				continue;
-			}
-			size_t CurrentReferenceCount = References.size();
-			{
-				CbObjectView Obj(Buffer.GetData());
-				Obj.IterateAttachments([&References](CbFieldView Field) { References.emplace_back(Field.AsAttachment()); });
-				Buffer = {};
-			}
-			UpdateKeys.push_back(Key);
-			ReferenceCounts.push_back(References.size() - CurrentReferenceCount);
-		}
-	}
-	{
-		for (const IoHash& Key : StandaloneKeys)
-		{
-			IoBuffer Buffer = GetStandaloneCacheValue(ZenContentType::kCbObject, Key);
-			if (!Buffer)
-			{
-				continue;
-			}
-
-			size_t CurrentReferenceCount = References.size();
-			{
-				CbObjectView Obj(Buffer.GetData());
-				Obj.IterateAttachments([&References](CbFieldView Field) { References.emplace_back(Field.AsAttachment()); });
-				Buffer = {};
-			}
-			UpdateKeys.push_back(Key);
-			ReferenceCounts.push_back(References.size() - CurrentReferenceCount);
-		}
-	}
-
 	{
-		size_t					   ReferenceOffset = 0;
-		RwLock::ExclusiveLockScope IndexLock(m_IndexLock);
-		if (!m_Configuration.EnableReferenceCaching)
-		{
-			ZEN_ASSERT(m_FirstReferenceIndex.empty());
-			ZEN_ASSERT(m_ReferenceHashes.empty());
-			ZEN_ASSERT(m_NextReferenceHashesIndexes.empty());
-			ZEN_ASSERT(m_ReferenceCount == 0);
-			// If reference caching is not enabled, we will resize and use the data structure in place for reference caching when
-			// we figure out what this bucket references. This will be reset once the DiskBucketReferenceChecker is deleted.
-			m_FirstReferenceIndex.resize(m_Payloads.size());
-		}
-		for (size_t Index = 0; Index < UpdateKeys.size(); Index++)
-		{
-			const IoHash& Key			 = UpdateKeys[Index];
-			size_t		  ReferenceCount = ReferenceCounts[Index];
-			auto		  It			 = m_Index.find(Key);
-			if (It == m_Index.end())
-			{
-				ReferenceOffset += ReferenceCount;
-				continue;
-			}
-			if (m_FirstReferenceIndex[It->second] != ReferenceIndex::Unknown())
-			{
-				continue;
-			}
-			SetReferences(IndexLock,
-						  m_FirstReferenceIndex[It->second],
-						  std::span<IoHash>{References.data() + ReferenceOffset, ReferenceCount});
-			ReferenceOffset += ReferenceCount;
-		}
-		if (m_Configuration.EnableReferenceCaching)
+		RwLock::SharedLockScope __(m_IndexLock);
+		if (m_Index.empty())
 		{
-			CompactReferences(IndexLock);
+			return {};
 		}
 	}
 
@@ -2777,6 +3551,8 @@ ZenCacheDiskLayer::CacheBucket::CreateReferenceCheckers(GcCtx& Ctx)
 void
 ZenCacheDiskLayer::CacheBucket::CompactReferences(RwLock::ExclusiveLockScope&)
 {
+	ZEN_TRACE_CPU("Z$::Disk::Bucket::CompactReferences");
+
 	std::vector<ReferenceIndex> FirstReferenceIndex;
 	std::vector<IoHash>			NewReferenceHashes;
 	std::vector<ReferenceIndex> NewNextReferenceHashesIndexes;
@@ -2813,7 +3589,9 @@ ZenCacheDiskLayer::CacheBucket::CompactReferences(RwLock::ExclusiveLockScope&)
 	}
 	m_FirstReferenceIndex.swap(FirstReferenceIndex);
 	m_ReferenceHashes.swap(NewReferenceHashes);
+	m_ReferenceHashes.shrink_to_fit();
 	m_NextReferenceHashesIndexes.swap(NewNextReferenceHashesIndexes);
+	m_NextReferenceHashesIndexes.shrink_to_fit();
 	m_ReferenceCount = m_ReferenceHashes.size();
 }
 
@@ -2940,24 +3718,24 @@ void
 ZenCacheDiskLayer::CacheBucket::ClearReferenceCache()
 {
 	RwLock::ExclusiveLockScope IndexLock(m_IndexLock);
-	m_FirstReferenceIndex.clear();
-	m_FirstReferenceIndex.shrink_to_fit();
-	m_ReferenceHashes.clear();
-	m_ReferenceHashes.shrink_to_fit();
-	m_NextReferenceHashesIndexes.clear();
-	m_NextReferenceHashesIndexes.shrink_to_fit();
+	Reset(m_FirstReferenceIndex);
+	Reset(m_ReferenceHashes);
+	Reset(m_NextReferenceHashesIndexes);
 	m_ReferenceCount = 0;
 }
 
 void
-ZenCacheDiskLayer::CacheBucket::CompactState(std::vector<BucketPayload>&  Payloads,
+ZenCacheDiskLayer::CacheBucket::CompactState(RwLock::ExclusiveLockScope&,
+											 std::vector<BucketPayload>&  Payloads,
 											 std::vector<AccessTime>&	  AccessTimes,
 											 std::vector<BucketMetaData>& MetaDatas,
-											 std::vector<IoBuffer>&		  MemCachedPayloads,
+											 std::vector<MemCacheData>&	  MemCachedPayloads,
 											 std::vector<ReferenceIndex>& FirstReferenceIndex,
 											 IndexMap&					  Index,
 											 RwLock::ExclusiveLockScope&  IndexLock)
 {
+	ZEN_TRACE_CPU("Z$::Disk::Bucket::CompactState");
+
 	size_t EntryCount = m_Index.size();
 	Payloads.reserve(EntryCount);
 	AccessTimes.reserve(EntryCount);
@@ -2966,6 +3744,8 @@ ZenCacheDiskLayer::CacheBucket::CompactState(std::vector<BucketPayload>&  Payloa
 		FirstReferenceIndex.reserve(EntryCount);
 	}
 	Index.reserve(EntryCount);
+	Index.min_load_factor(IndexMinLoadFactor);
+	Index.max_load_factor(IndexMaxLoadFactor);
 	for (auto It : m_Index)
 	{
 		PayloadIndex EntryIndex = PayloadIndex(Payloads.size());
@@ -2975,11 +3755,12 @@ ZenCacheDiskLayer::CacheBucket::CompactState(std::vector<BucketPayload>&  Payloa
 		if (Payload.MetaData)
 		{
 			MetaDatas.push_back(m_MetaDatas[Payload.MetaData]);
-			Payload.MetaData = MetaDataIndex(m_MetaDatas.size() - 1);
+			Payload.MetaData = MetaDataIndex(MetaDatas.size() - 1);
 		}
 		if (Payload.MemCached)
 		{
-			MemCachedPayloads.push_back(std::move(m_MemCachedPayloads[Payload.MemCached]));
+			MemCachedPayloads.emplace_back(
+				MemCacheData{.Payload = std::move(m_MemCachedPayloads[Payload.MemCached].Payload), .OwnerIndex = EntryIndex});
 			Payload.MemCached = MemCachedIndex(gsl::narrow<uint32_t>(MemCachedPayloads.size() - 1));
 		}
 		if (m_Configuration.EnableReferenceCaching)
@@ -2992,11 +3773,9 @@ ZenCacheDiskLayer::CacheBucket::CompactState(std::vector<BucketPayload>&  Payloa
 	m_Payloads.swap(Payloads);
 	m_AccessTimes.swap(AccessTimes);
 	m_MetaDatas.swap(MetaDatas);
-	m_FreeMetaDatas.clear();
-	m_FreeMetaDatas.shrink_to_fit();
+	Reset(m_FreeMetaDatas);
 	m_MemCachedPayloads.swap(MemCachedPayloads);
-	m_FreeMemCachedPayloads.clear();
-	m_FreeMetaDatas.shrink_to_fit();
+	Reset(m_FreeMemCachedPayloads);
 	if (m_Configuration.EnableReferenceCaching)
 	{
 		m_FirstReferenceIndex.swap(FirstReferenceIndex);
@@ -3031,124 +3810,99 @@ ZenCacheDiskLayer::ZenCacheDiskLayer(GcManager& Gc, JobQueue& JobQueue, const st
 
 ZenCacheDiskLayer::~ZenCacheDiskLayer()
 {
-}
-
-bool
-ZenCacheDiskLayer::Get(std::string_view InBucket, const IoHash& HashKey, ZenCacheValue& OutValue)
-{
-	ZEN_TRACE_CPU("Z$::Disk::Get");
-
-	const auto	 BucketName = std::string(InBucket);
-	CacheBucket* Bucket		= nullptr;
-
+	try
 	{
-		RwLock::SharedLockScope _(m_Lock);
-
-		auto It = m_Buckets.find(BucketName);
-
-		if (It != m_Buckets.end())
 		{
-			Bucket = It->second.get();
+			RwLock::ExclusiveLockScope _(m_Lock);
+			for (auto& It : m_Buckets)
+			{
+				m_DroppedBuckets.emplace_back(std::move(It.second));
+			}
+			m_Buckets.clear();
 		}
+		// We destroy the buckets without holding a lock since destructor calls GcManager::RemoveGcReferencer which takes an exclusive lock.
+		// This can cause a deadlock, if GC is running we would block while holding ZenCacheDiskLayer::m_Lock
+		m_DroppedBuckets.clear();
 	}
-
-	if (Bucket == nullptr)
+	catch (std::exception& Ex)
 	{
-		// Bucket needs to be opened/created
+		ZEN_ERROR("~ZenCacheDiskLayer() failed. Reason: '{}'", Ex.what());
+	}
+}
 
-		RwLock::ExclusiveLockScope _(m_Lock);
+ZenCacheDiskLayer::CacheBucket*
+ZenCacheDiskLayer::GetOrCreateBucket(std::string_view InBucket)
+{
+	ZEN_TRACE_CPU("Z$::Disk::GetOrCreateBucket");
+	const auto BucketName = std::string(InBucket);
 
+	{
+		RwLock::SharedLockScope SharedLock(m_Lock);
 		if (auto It = m_Buckets.find(BucketName); It != m_Buckets.end())
 		{
-			Bucket = It->second.get();
-		}
-		else
-		{
-			auto InsertResult =
-				m_Buckets.emplace(BucketName,
-								  std::make_unique<CacheBucket>(m_Gc, m_TotalMemCachedSize, BucketName, m_Configuration.BucketConfig));
-			Bucket = InsertResult.first->second.get();
-
-			std::filesystem::path BucketPath = m_RootDir;
-			BucketPath /= BucketName;
-
-			if (!Bucket->OpenOrCreate(BucketPath))
-			{
-				m_Buckets.erase(InsertResult.first);
-				return false;
-			}
+			return It->second.get();
 		}
 	}
 
-	ZEN_ASSERT(Bucket != nullptr);
-	if (Bucket->Get(HashKey, OutValue))
+	// We create the bucket without holding a lock since contructor calls GcManager::AddGcReferencer which takes an exclusive lock.
+	// This can cause a deadlock, if GC is running we would block while holding ZenCacheDiskLayer::m_Lock
+	std::unique_ptr<CacheBucket> Bucket(
+		std::make_unique<CacheBucket>(m_Gc, m_TotalMemCachedSize, BucketName, m_Configuration.BucketConfig));
+
+	RwLock::ExclusiveLockScope Lock(m_Lock);
+	if (auto It = m_Buckets.find(BucketName); It != m_Buckets.end())
 	{
-		TryMemCacheTrim();
-		return true;
+		return It->second.get();
 	}
-	return false;
-}
-
-void
-ZenCacheDiskLayer::Put(std::string_view InBucket, const IoHash& HashKey, const ZenCacheValue& Value, std::span<IoHash> References)
-{
-	ZEN_TRACE_CPU("Z$::Disk::Put");
-
-	const auto	 BucketName = std::string(InBucket);
-	CacheBucket* Bucket		= nullptr;
 
+	std::filesystem::path BucketPath = m_RootDir;
+	BucketPath /= BucketName;
+	try
 	{
-		RwLock::SharedLockScope _(m_Lock);
-
-		auto It = m_Buckets.find(BucketName);
-
-		if (It != m_Buckets.end())
+		if (!Bucket->OpenOrCreate(BucketPath))
 		{
-			Bucket = It->second.get();
+			ZEN_WARN("Found directory '{}' in our base directory '{}' but it is not a valid bucket", BucketName, m_RootDir);
+			return nullptr;
 		}
 	}
-
-	if (Bucket == nullptr)
+	catch (const std::exception& Err)
 	{
-		// New bucket needs to be created
+		ZEN_WARN("Creating bucket '{}' in '{}' FAILED, reason: '{}'", BucketName, BucketPath, Err.what());
+		throw;
+	}
 
-		RwLock::ExclusiveLockScope _(m_Lock);
+	CacheBucket* Result = Bucket.get();
+	m_Buckets.emplace(BucketName, std::move(Bucket));
 
-		if (auto It = m_Buckets.find(BucketName); It != m_Buckets.end())
-		{
-			Bucket = It->second.get();
-		}
-		else
-		{
-			auto InsertResult =
-				m_Buckets.emplace(BucketName,
-								  std::make_unique<CacheBucket>(m_Gc, m_TotalMemCachedSize, BucketName, m_Configuration.BucketConfig));
-			Bucket = InsertResult.first->second.get();
+	return Result;
+}
 
-			std::filesystem::path BucketPath = m_RootDir;
-			BucketPath /= BucketName;
+bool
+ZenCacheDiskLayer::Get(std::string_view InBucket, const IoHash& HashKey, ZenCacheValue& OutValue)
+{
+	ZEN_TRACE_CPU("Z$::Disk::Get");
 
-			try
-			{
-				if (!Bucket->OpenOrCreate(BucketPath))
-				{
-					ZEN_WARN("Found directory '{}' in our base directory '{}' but it is not a valid bucket", BucketName, m_RootDir);
-					m_Buckets.erase(InsertResult.first);
-					return;
-				}
-			}
-			catch (const std::exception& Err)
-			{
-				ZEN_WARN("creating bucket '{}' in '{}' FAILED, reason: '{}'", BucketName, BucketPath, Err.what());
-				throw;
-			}
+	if (CacheBucket* Bucket = GetOrCreateBucket(InBucket); Bucket != nullptr)
+	{
+		if (Bucket->Get(HashKey, OutValue))
+		{
+			TryMemCacheTrim();
+			return true;
 		}
 	}
+	return false;
+}
 
-	ZEN_ASSERT(Bucket != nullptr);
+void
+ZenCacheDiskLayer::Put(std::string_view InBucket, const IoHash& HashKey, const ZenCacheValue& Value, std::span<IoHash> References)
+{
+	ZEN_TRACE_CPU("Z$::Disk::Put");
 
-	Bucket->Put(HashKey, Value, References);
-	TryMemCacheTrim();
+	if (CacheBucket* Bucket = GetOrCreateBucket(InBucket); Bucket != nullptr)
+	{
+		Bucket->Put(HashKey, Value, References);
+		TryMemCacheTrim();
+	}
 }
 
 void
@@ -3208,11 +3962,8 @@ ZenCacheDiskLayer::DiscoverBuckets()
 
 	RwLock SyncLock;
 
-	const size_t MaxHwTreadUse		   = std::thread::hardware_concurrency();
-	const int	 WorkerThreadPoolCount = gsl::narrow<int>(Min(MaxHwTreadUse, FoundBucketDirectories.size()));
-
-	WorkerThreadPool Pool(WorkerThreadPoolCount);
-	Latch			 WorkLatch(1);
+	WorkerThreadPool& Pool = GetLargeWorkerPool();
+	Latch			  WorkLatch(1);
 	for (auto& BucketPath : FoundBucketDirectories)
 	{
 		WorkLatch.AddCount(1);
@@ -3301,13 +4052,17 @@ void
 ZenCacheDiskLayer::Flush()
 {
 	std::vector<CacheBucket*> Buckets;
+	Stopwatch				  Timer;
+	const auto				  _ = MakeGuard([&] {
+		   if (Buckets.empty())
+		   {
+			   return;
+		   }
+		   ZEN_INFO("Flushed {} buckets at '{}' in {}", Buckets.size(), m_RootDir, NiceTimeSpanMs(Timer.GetElapsedTimeMs()));
+	   });
 
 	{
-		RwLock::SharedLockScope _(m_Lock);
-		if (m_Buckets.empty())
-		{
-			return;
-		}
+		RwLock::SharedLockScope __(m_Lock);
 		Buckets.reserve(m_Buckets.size());
 		for (auto& Kv : m_Buckets)
 		{
@@ -3315,28 +4070,29 @@ ZenCacheDiskLayer::Flush()
 			Buckets.push_back(Bucket);
 		}
 	}
-	const size_t MaxHwTreadUse		   = Max((std::thread::hardware_concurrency() / 4u), 1u);
-	const int	 WorkerThreadPoolCount = gsl::narrow<int>(Min(MaxHwTreadUse, Buckets.size()));
-
-	WorkerThreadPool Pool(WorkerThreadPoolCount);
-	Latch			 WorkLatch(1);
-	for (auto& Bucket : Buckets)
 	{
-		WorkLatch.AddCount(1);
-		Pool.ScheduleWork([&]() {
-			auto _ = MakeGuard([&]() { WorkLatch.CountDown(); });
-			Bucket->Flush();
-		});
+		WorkerThreadPool& Pool = GetSmallWorkerPool();
+		Latch			  WorkLatch(1);
+		for (auto& Bucket : Buckets)
+		{
+			WorkLatch.AddCount(1);
+			Pool.ScheduleWork([&]() {
+				auto _ = MakeGuard([&]() { WorkLatch.CountDown(); });
+				Bucket->Flush();
+			});
+		}
+		WorkLatch.CountDown();
+		while (!WorkLatch.Wait(1000))
+		{
+			ZEN_DEBUG("Waiting for {} buckets at '{}' to flush", WorkLatch.Remaining(), m_RootDir);
+		}
 	}
-	WorkLatch.CountDown();
-	WorkLatch.Wait();
 }
 
 void
 ZenCacheDiskLayer::ScrubStorage(ScrubContext& Ctx)
 {
 	RwLock::SharedLockScope _(m_Lock);
-
 	{
 		std::vector<std::future<void>> Results;
 		Results.reserve(m_Buckets.size());
@@ -3457,19 +4213,21 @@ ZenCacheDiskLayer::EnumerateBucketContents(std::string_view
 CacheValueDetails::NamespaceDetails
 ZenCacheDiskLayer::GetValueDetails(const std::string_view BucketFilter, const std::string_view ValueFilter) const
 {
-	RwLock::SharedLockScope				_(m_Lock);
 	CacheValueDetails::NamespaceDetails Details;
-	if (BucketFilter.empty())
 	{
-		Details.Buckets.reserve(BucketFilter.empty() ? m_Buckets.size() : 1);
-		for (auto& Kv : m_Buckets)
+		RwLock::SharedLockScope IndexLock(m_Lock);
+		if (BucketFilter.empty())
 		{
-			Details.Buckets[Kv.first] = Kv.second->GetValueDetails(ValueFilter);
+			Details.Buckets.reserve(BucketFilter.empty() ? m_Buckets.size() : 1);
+			for (auto& Kv : m_Buckets)
+			{
+				Details.Buckets[Kv.first] = Kv.second->GetValueDetails(IndexLock, ValueFilter);
+			}
+		}
+		else if (auto It = m_Buckets.find(std::string(BucketFilter)); It != m_Buckets.end())
+		{
+			Details.Buckets[It->first] = It->second->GetValueDetails(IndexLock, ValueFilter);
 		}
-	}
-	else if (auto It = m_Buckets.find(std::string(BucketFilter)); It != m_Buckets.end())
-	{
-		Details.Buckets[It->first] = It->second->GetValueDetails(ValueFilter);
 	}
 	return Details;
 }
@@ -3480,17 +4238,8 @@ ZenCacheDiskLayer::MemCacheTrim()
 	ZEN_TRACE_CPU("Z$::Disk::MemCacheTrim");
 
 	ZEN_ASSERT(m_Configuration.MemCacheTargetFootprintBytes != 0);
-
-	const GcClock::TimePoint Now = GcClock::Now();
-
-	const GcClock::Tick		   NowTick			   = Now.time_since_epoch().count();
-	const std::chrono::seconds TrimInterval		   = std::chrono::seconds(m_Configuration.MemCacheTrimIntervalSeconds);
-	GcClock::Tick			   LastTrimTick		   = m_LastTickMemCacheTrim;
-	const GcClock::Tick		   NextAllowedTrimTick = LastTrimTick + GcClock::Duration(TrimInterval).count();
-	if (NowTick < NextAllowedTrimTick)
-	{
-		return;
-	}
+	ZEN_ASSERT(m_Configuration.MemCacheMaxAgeSeconds != 0);
+	ZEN_ASSERT(m_Configuration.MemCacheTrimIntervalSeconds != 0);
 
 	bool Expected = false;
 	if (!m_IsMemCacheTrimming.compare_exchange_strong(Expected, true))
@@ -3498,75 +4247,90 @@ ZenCacheDiskLayer::MemCacheTrim()
 		return;
 	}
 
-	// Bump time forward so we don't keep trying to do m_IsTrimming.compare_exchange_strong
-	const GcClock::Tick NextTrimTick = NowTick + GcClock::Duration(TrimInterval).count();
-	m_LastTickMemCacheTrim.store(NextTrimTick);
+	try
+	{
+		m_JobQueue.QueueJob("ZenCacheDiskLayer::MemCacheTrim", [this](JobContext&) {
+			ZEN_TRACE_CPU("Z$::ZenCacheDiskLayer::MemCacheTrim [Async]");
+
+			const std::chrono::seconds TrimInterval = std::chrono::seconds(m_Configuration.MemCacheTrimIntervalSeconds);
+			uint64_t				   TrimmedSize	= 0;
+			Stopwatch				   Timer;
+			const auto				   Guard = MakeGuard([&] {
+				ZEN_INFO("trimmed {} (remaining {}), from memory cache in {}",
+						 NiceBytes(TrimmedSize),
+						 NiceBytes(m_TotalMemCachedSize),
+						 NiceTimeSpanMs(Timer.GetElapsedTimeMs()));
+
+				const GcClock::Tick NowTick		 = GcClock::TickCount();
+				const GcClock::Tick NextTrimTick = NowTick + GcClock::Duration(TrimInterval).count();
+				m_NextAllowedTrimTick.store(NextTrimTick);
+				m_IsMemCacheTrimming.store(false);
+			});
 
-	m_JobQueue.QueueJob("ZenCacheDiskLayer::MemCacheTrim", [this, Now, TrimInterval](JobContext&) {
-		ZEN_TRACE_CPU("Z$::ZenCacheDiskLayer::MemCacheTrim [Async]");
+			const std::chrono::seconds MaxAge = std::chrono::seconds(m_Configuration.MemCacheMaxAgeSeconds);
 
-		uint64_t   StartSize = m_TotalMemCachedSize.load();
-		Stopwatch  Timer;
-		const auto Guard = MakeGuard([&] {
-			uint64_t EndSize = m_TotalMemCachedSize.load();
-			ZEN_INFO("trimmed {} (remaining {}), from memory cache in {}",
-					 NiceBytes(StartSize > EndSize ? StartSize - EndSize : 0),
-					 NiceBytes(m_TotalMemCachedSize),
-					 NiceTimeSpanMs(Timer.GetElapsedTimeMs()));
-			m_IsMemCacheTrimming.store(false);
-		});
-
-		const std::chrono::seconds MaxAge = std::chrono::seconds(m_Configuration.MemCacheMaxAgeSeconds);
+			static const size_t	  UsageSlotCount = 2048;
+			std::vector<uint64_t> UsageSlots;
+			UsageSlots.reserve(UsageSlotCount);
 
-		std::vector<uint64_t> UsageSlots;
-		UsageSlots.reserve(std::chrono::seconds(MaxAge / TrimInterval).count());
+			std::vector<CacheBucket*> Buckets;
+			{
+				RwLock::SharedLockScope __(m_Lock);
+				Buckets.reserve(m_Buckets.size());
+				for (auto& Kv : m_Buckets)
+				{
+					Buckets.push_back(Kv.second.get());
+				}
+			}
 
-		std::vector<CacheBucket*> Buckets;
-		{
-			RwLock::SharedLockScope __(m_Lock);
-			Buckets.reserve(m_Buckets.size());
-			for (auto& Kv : m_Buckets)
+			const GcClock::TimePoint Now = GcClock::Now();
 			{
-				Buckets.push_back(Kv.second.get());
+				ZEN_TRACE_CPU("Z$::ZenCacheDiskLayer::MemCacheTrim GetUsageByAccess");
+				for (CacheBucket* Bucket : Buckets)
+				{
+					Bucket->GetUsageByAccess(Now, MaxAge, UsageSlots);
+				}
 			}
-		}
-		for (CacheBucket* Bucket : Buckets)
-		{
-			Bucket->GetUsageByAccess(Now, GcClock::Duration(TrimInterval), UsageSlots);
-		}
 
-		uint64_t TotalSize = 0;
-		for (size_t Index = 0; Index < UsageSlots.size(); ++Index)
-		{
-			TotalSize += UsageSlots[Index];
-			if (TotalSize >= m_Configuration.MemCacheTargetFootprintBytes)
+			uint64_t TotalSize = 0;
+			for (size_t Index = 0; Index < UsageSlots.size(); ++Index)
 			{
-				GcClock::TimePoint ExpireTime = Now - (TrimInterval * Index);
-				MemCacheTrim(Buckets, ExpireTime);
-				break;
+				TotalSize += UsageSlots[Index];
+				if (TotalSize >= m_Configuration.MemCacheTargetFootprintBytes)
+				{
+					GcClock::TimePoint ExpireTime = Now - ((GcClock::Duration(MaxAge) * Index) / UsageSlotCount);
+					TrimmedSize					  = MemCacheTrim(Buckets, ExpireTime);
+					break;
+				}
 			}
-		}
-	});
+		});
+	}
+	catch (std::exception& Ex)
+	{
+		ZEN_ERROR("Failed scheduling ZenCacheDiskLayer::MemCacheTrim. Reason: '{}'", Ex.what());
+		m_IsMemCacheTrimming.store(false);
+	}
 }
 
-void
+uint64_t
 ZenCacheDiskLayer::MemCacheTrim(std::vector<CacheBucket*>& Buckets, GcClock::TimePoint ExpireTime)
 {
 	if (m_Configuration.MemCacheTargetFootprintBytes == 0)
 	{
-		return;
+		return 0;
 	}
-	RwLock::SharedLockScope __(m_Lock);
+	uint64_t TrimmedSize = 0;
 	for (CacheBucket* Bucket : Buckets)
 	{
-		Bucket->MemCacheTrim(ExpireTime);
+		TrimmedSize += Bucket->MemCacheTrim(ExpireTime);
 	}
 	const GcClock::TimePoint   Now				   = GcClock::Now();
 	const GcClock::Tick		   NowTick			   = Now.time_since_epoch().count();
 	const std::chrono::seconds TrimInterval		   = std::chrono::seconds(m_Configuration.MemCacheTrimIntervalSeconds);
-	GcClock::Tick			   LastTrimTick		   = m_LastTickMemCacheTrim;
+	GcClock::Tick			   LastTrimTick		   = m_NextAllowedTrimTick;
 	const GcClock::Tick		   NextAllowedTrimTick = NowTick + GcClock::Duration(TrimInterval).count();
-	m_LastTickMemCacheTrim.compare_exchange_strong(LastTrimTick, NextAllowedTrimTick);
+	m_NextAllowedTrimTick.compare_exchange_strong(LastTrimTick, NextAllowedTrimTick);
+	return TrimmedSize;
 }
 
 #if ZEN_WITH_TESTS
diff --git a/src/zenserver/cache/cachedisklayer.h b/src/zenserver/cache/cachedisklayer.h
index d46d629e4..6997a12e4 100644
--- a/src/zenserver/cache/cachedisklayer.h
+++ b/src/zenserver/cache/cachedisklayer.h
@@ -29,14 +29,25 @@ struct DiskLocation
 
 	inline DiskLocation(uint64_t ValueSize, uint8_t Flags) : Flags(Flags | kStandaloneFile) { Location.StandaloneSize = ValueSize; }
 
-	inline DiskLocation(const BlockStoreLocation& Location, uint64_t PayloadAlignment, uint8_t Flags) : Flags(Flags & ~kStandaloneFile)
+	inline DiskLocation(const BlockStoreLocation& Location, uint32_t PayloadAlignment, uint8_t Flags) : Flags(Flags & ~kStandaloneFile)
 	{
 		this->Location.BlockLocation = BlockStoreDiskLocation(Location, PayloadAlignment);
 	}
 
-	inline bool operator!=(const DiskLocation& Rhs) const { return memcmp(&Location, &Rhs.Location, sizeof(Location)) != 0; }
+	inline bool operator!=(const DiskLocation& Rhs) const
+	{
+		if (Flags != Rhs.Flags)
+		{
+			return true;
+		}
+		if (Flags & kStandaloneFile)
+		{
+			return Location.StandaloneSize != Rhs.Location.StandaloneSize;
+		}
+		return Location.BlockLocation != Rhs.Location.BlockLocation;
+	}
 
-	inline BlockStoreLocation GetBlockLocation(uint64_t PayloadAlignment) const
+	inline BlockStoreLocation GetBlockLocation(uint32_t PayloadAlignment) const
 	{
 		ZEN_ASSERT(!(Flags & kStandaloneFile));
 		return Location.BlockLocation.Get(PayloadAlignment);
@@ -95,7 +106,7 @@ public:
 	struct BucketConfiguration
 	{
 		uint64_t MaxBlockSize			= 1ull << 30;
-		uint64_t PayloadAlignment		= 1ull << 4;
+		uint32_t PayloadAlignment		= 1u << 4;
 		uint64_t MemCacheSizeThreshold	= 1 * 1024;
 		uint64_t LargeObjectThreshold	= 128 * 1024;
 		bool	 EnableReferenceCaching = false;
@@ -178,7 +189,6 @@ public:
 	void SetAccessTime(std::string_view Bucket, const IoHash& HashKey, GcClock::TimePoint Time);
 #endif	// ZEN_WITH_TESTS
 
-private:
 	/** A cache bucket manages a single directory containing
 		metadata and data for that bucket
 	  */
@@ -187,15 +197,15 @@ private:
 		CacheBucket(GcManager& Gc, std::atomic_uint64_t& OuterCacheMemoryUsage, std::string BucketName, const BucketConfiguration& Config);
 		~CacheBucket();
 
-		bool OpenOrCreate(std::filesystem::path BucketDir, bool AllowCreate = true);
-		bool Get(const IoHash& HashKey, ZenCacheValue& OutValue);
-		void Put(const IoHash& HashKey, const ZenCacheValue& Value, std::span<IoHash> References);
-		void MemCacheTrim(GcClock::TimePoint ExpireTime);
-		bool Drop();
-		void Flush();
-		void ScrubStorage(ScrubContext& Ctx);
-		void GatherReferences(GcContext& GcCtx);
-		void CollectGarbage(GcContext& GcCtx);
+		bool	 OpenOrCreate(std::filesystem::path BucketDir, bool AllowCreate = true);
+		bool	 Get(const IoHash& HashKey, ZenCacheValue& OutValue);
+		void	 Put(const IoHash& HashKey, const ZenCacheValue& Value, std::span<IoHash> References);
+		uint64_t MemCacheTrim(GcClock::TimePoint ExpireTime);
+		bool	 Drop();
+		void	 Flush();
+		void	 ScrubStorage(ScrubContext& Ctx);
+		void	 GatherReferences(GcContext& GcCtx);
+		void	 CollectGarbage(GcContext& GcCtx);
 
 		inline GcStorageSize StorageSize() const
 		{
@@ -205,30 +215,15 @@ private:
 		uint64_t	EntryCount() const;
 		BucketStats Stats();
 
-		CacheValueDetails::BucketDetails GetValueDetails(const std::string_view ValueFilter) const;
+		CacheValueDetails::BucketDetails GetValueDetails(RwLock::SharedLockScope& IndexLock, const std::string_view ValueFilter) const;
 		void EnumerateBucketContents(std::function<void(const IoHash& Key, const CacheValueDetails::ValueDetails& Details)>& Fn) const;
 
-		void GetUsageByAccess(GcClock::TimePoint TickStart, GcClock::Duration SectionLength, std::vector<uint64_t>& InOutUsageSlots);
+		void GetUsageByAccess(GcClock::TimePoint Now, GcClock::Duration MaxAge, std::vector<uint64_t>& InOutUsageSlots);
 #if ZEN_WITH_TESTS
 		void SetAccessTime(const IoHash& HashKey, GcClock::TimePoint Time);
 #endif	// ZEN_WITH_TESTS
 
 	private:
-		GcManager&			  m_Gc;
-		std::atomic_uint64_t& m_OuterCacheMemoryUsage;
-		std::string			  m_BucketName;
-		std::filesystem::path m_BucketDir;
-		std::filesystem::path m_BlocksBasePath;
-		BucketConfiguration	  m_Configuration;
-		BlockStore			  m_BlockStore;
-		Oid					  m_BucketId;
-		std::atomic_bool	  m_IsFlushing{};
-
-		// These files are used to manage storage of small objects for this bucket
-
-		TCasLogFile<DiskIndexEntry> m_SlogFile;
-		uint64_t					m_LogFlushPosition = 0;
-
 #pragma pack(push)
 #pragma pack(1)
 		struct MetaDataIndex
@@ -291,6 +286,11 @@ private:
 
 			operator bool() const { return RawSize != 0 || RawHash != IoHash::Zero; };
 		};
+		struct MemCacheData
+		{
+			IoBuffer	 Payload;
+			PayloadIndex OwnerIndex;
+		};
 #pragma pack(pop)
 		static_assert(sizeof(BucketPayload) == 20u);
 		static_assert(sizeof(BucketMetaData) == 28u);
@@ -298,6 +298,21 @@ private:
 
 		using IndexMap = tsl::robin_map<IoHash, PayloadIndex, IoHash::Hasher>;
 
+		GcManager&			  m_Gc;
+		std::atomic_uint64_t& m_OuterCacheMemoryUsage;
+		std::string			  m_BucketName;
+		std::filesystem::path m_BucketDir;
+		std::filesystem::path m_BlocksBasePath;
+		BucketConfiguration	  m_Configuration;
+		BlockStore			  m_BlockStore;
+		Oid					  m_BucketId;
+		std::atomic_bool	  m_IsFlushing{true};  // Don't allow flush until we are properly initialized
+
+		// These files are used to manage storage of small objects for this bucket
+
+		TCasLogFile<DiskIndexEntry> m_SlogFile;
+		uint64_t					m_LogFlushPosition = 0;
+
 		std::atomic<uint64_t> m_DiskHitCount;
 		std::atomic<uint64_t> m_DiskMissCount;
 		std::atomic<uint64_t> m_DiskWriteCount;
@@ -313,17 +328,18 @@ private:
 		std::vector<BucketPayload>	m_Payloads;
 		std::vector<BucketMetaData> m_MetaDatas;
 		std::vector<MetaDataIndex>	m_FreeMetaDatas;
-		std::vector<IoBuffer>		m_MemCachedPayloads;
+		std::vector<MemCacheData>	m_MemCachedPayloads;
 		std::vector<MemCachedIndex> m_FreeMemCachedPayloads;
 		std::vector<ReferenceIndex> m_FirstReferenceIndex;
 		std::vector<IoHash>			m_ReferenceHashes;
 		std::vector<ReferenceIndex> m_NextReferenceHashesIndexes;
+		std::unique_ptr<HashSet>	m_UpdatedKeys;
 		size_t						m_ReferenceCount = 0;
 		std::atomic_uint64_t		m_StandaloneSize{};
 		std::atomic_uint64_t		m_MemCachedSize{};
 
 		virtual std::string						 GetGcName(GcCtx& Ctx) override;
-		virtual void							 RemoveExpiredData(GcCtx& Ctx, GcReferencerStats& Stats) override;
+		virtual GcStoreCompactor*				 RemoveExpiredData(GcCtx& Ctx, GcStats& Stats) override;
 		virtual std::vector<GcReferenceChecker*> CreateReferenceCheckers(GcCtx& Ctx) override;
 
 		void	 BuildPath(PathBuilderBase& Path, const IoHash& HashKey) const;
@@ -331,19 +347,9 @@ private:
 		IoBuffer GetStandaloneCacheValue(ZenContentType ContentType, const IoHash& HashKey) const;
 		void	 PutInlineCacheValue(const IoHash& HashKey, const ZenCacheValue& Value, std::span<IoHash> References);
 		IoBuffer GetInlineCacheValue(const DiskLocation& Loc) const;
-		void	 MakeIndexSnapshot(const std::function<uint64_t()>& ClaimDiskReserveFunc = []() { return 0; });
-		uint64_t ReadIndexFile(const std::filesystem::path& IndexPath, uint32_t& OutVersion);
-		uint64_t ReadLog(const std::filesystem::path& LogPath, uint64_t LogPosition);
-		void	 OpenLog(const bool IsNew);
-		CbObject MakeManifest(IndexMap&&						 Index,
-							  std::vector<AccessTime>&&			 AccessTimes,
-							  const std::vector<BucketPayload>&	 Payloads,
-							  const std::vector<BucketMetaData>& MetaDatas);
-		void	 SaveManifest(
-				CbObject&&						 Manifest,
-				const std::function<uint64_t()>& ClaimDiskReserveFunc = []() { return 0; });
-		CacheValueDetails::ValueDetails GetValueDetails(const IoHash& Key, PayloadIndex Index) const;
-		void							CompactReferences(RwLock::ExclusiveLockScope&);
+		CacheValueDetails::ValueDetails GetValueDetails(RwLock::SharedLockScope&, const IoHash& Key, PayloadIndex Index) const;
+
+		void		CompactReferences(RwLock::ExclusiveLockScope&);
 		void		SetReferences(RwLock::ExclusiveLockScope&, ReferenceIndex& FirstReferenceIndex, std::span<IoHash> References);
 		void		RemoveReferences(RwLock::ExclusiveLockScope&, ReferenceIndex& FirstReferenceIndex);
 		inline bool GetReferences(RwLock::SharedLockScope&, ReferenceIndex FirstReferenceIndex, std::vector<IoHash>& OutReferences) const
@@ -357,16 +363,39 @@ private:
 		ReferenceIndex AllocateReferenceEntry(RwLock::ExclusiveLockScope&, const IoHash& Key);
 		bool		   LockedGetReferences(ReferenceIndex FirstReferenceIndex, std::vector<IoHash>& OutReferences) const;
 		void		   ClearReferenceCache();
-		void		   SetMetaData(BucketPayload& Payload, const ZenCacheDiskLayer::CacheBucket::BucketMetaData& MetaData);
-		void		   RemoveMetaData(BucketPayload& Payload);
-		BucketMetaData GetMetaData(const BucketPayload& Payload) const;
-		void		   SetMemCachedData(BucketPayload& Payload, IoBuffer& MemCachedData);
-		size_t		   RemoveMemCachedData(BucketPayload& Payload);
 
-		void CompactState(std::vector<BucketPayload>&  Payloads,
+		void		   SetMetaData(RwLock::ExclusiveLockScope&,
+								   BucketPayload&										 Payload,
+								   const ZenCacheDiskLayer::CacheBucket::BucketMetaData& MetaData);
+		void		   RemoveMetaData(RwLock::ExclusiveLockScope&, BucketPayload& Payload);
+		BucketMetaData GetMetaData(RwLock::SharedLockScope&, const BucketPayload& Payload) const;
+		void		   SetMemCachedData(RwLock::ExclusiveLockScope&, PayloadIndex PayloadIndex, IoBuffer& MemCachedData);
+		size_t		   RemoveMemCachedData(RwLock::ExclusiveLockScope&, BucketPayload& Payload);
+
+		void	 InitializeIndexFromDisk(RwLock::ExclusiveLockScope&, bool IsNew);
+		uint64_t ReadIndexFile(RwLock::ExclusiveLockScope&, const std::filesystem::path& IndexPath, uint32_t& OutVersion);
+		uint64_t ReadLog(RwLock::ExclusiveLockScope&, const std::filesystem::path& LogPath, uint64_t LogPosition);
+
+		void SaveSnapshot(const std::function<uint64_t()>& ClaimDiskReserveFunc = []() { return 0; });
+		void WriteIndexSnapshot(
+			RwLock::ExclusiveLockScope&,
+			const std::function<uint64_t()>& ClaimDiskReserveFunc = []() { return 0; })
+		{
+			WriteIndexSnapshotLocked(ClaimDiskReserveFunc);
+		}
+		void WriteIndexSnapshot(
+			RwLock::SharedLockScope&,
+			const std::function<uint64_t()>& ClaimDiskReserveFunc = []() { return 0; })
+		{
+			WriteIndexSnapshotLocked(ClaimDiskReserveFunc);
+		}
+		void WriteIndexSnapshotLocked(const std::function<uint64_t()>& ClaimDiskReserveFunc = []() { return 0; });
+
+		void CompactState(RwLock::ExclusiveLockScope&,
+						  std::vector<BucketPayload>&  Payloads,
 						  std::vector<AccessTime>&	   AccessTimes,
 						  std::vector<BucketMetaData>& MetaDatas,
-						  std::vector<IoBuffer>&	   MemCachedPayloads,
+						  std::vector<MemCacheData>&   MemCachedPayloads,
 						  std::vector<ReferenceIndex>& FirstReferenceIndex,
 						  IndexMap&					   Index,
 						  RwLock::ExclusiveLockScope&  IndexLock);
@@ -381,6 +410,10 @@ private:
 			m_MemCachedSize.fetch_sub(ValueSize, std::memory_order::relaxed);
 			m_OuterCacheMemoryUsage.fetch_sub(ValueSize, std::memory_order::relaxed);
 		}
+		static inline uint64_t EstimateMemCachePayloadMemory(uint64_t PayloadSize)
+		{
+			return sizeof(MemCacheData) + sizeof(IoBufferCore) + RoundUp(PayloadSize, 8u);
+		}
 
 		// These locks are here to avoid contention on file creation, therefore it's sufficient
 		// that we take the same lock for the same hash
@@ -392,9 +425,13 @@ private:
 		inline RwLock& LockForHash(const IoHash& Hash) const { return m_ShardedLocks[Hash.Hash[19]]; }
 
 		friend class DiskBucketReferenceChecker;
+		friend class DiskBucketStoreCompactor;
+		friend class BucketManifestSerializer;
 	};
 
-	inline void TryMemCacheTrim()
+private:
+	CacheBucket* GetOrCreateBucket(std::string_view InBucket);
+	inline void	 TryMemCacheTrim()
 	{
 		if (m_Configuration.MemCacheTargetFootprintBytes == 0)
 		{
@@ -408,10 +445,21 @@ private:
 		{
 			return;
 		}
+		if (m_IsMemCacheTrimming)
+		{
+			return;
+		}
+
+		const GcClock::Tick NowTick = GcClock::TickCount();
+		if (NowTick < m_NextAllowedTrimTick)
+		{
+			return;
+		}
+
 		MemCacheTrim();
 	}
-	void MemCacheTrim();
-	void MemCacheTrim(std::vector<CacheBucket*>& Buckets, GcClock::TimePoint ExpireTime);
+	void	 MemCacheTrim();
+	uint64_t MemCacheTrim(std::vector<CacheBucket*>& Buckets, GcClock::TimePoint ExpireTime);
 
 	GcManager&													  m_Gc;
 	JobQueue&													  m_JobQueue;
@@ -419,7 +467,7 @@ private:
 	Configuration												  m_Configuration;
 	std::atomic_uint64_t										  m_TotalMemCachedSize{};
 	std::atomic_bool											  m_IsMemCacheTrimming = false;
-	std::atomic<GcClock::Tick>									  m_LastTickMemCacheTrim;
+	std::atomic<GcClock::Tick>									  m_NextAllowedTrimTick;
 	mutable RwLock												  m_Lock;
 	std::unordered_map<std::string, std::unique_ptr<CacheBucket>> m_Buckets;
 	std::vector<std::unique_ptr<CacheBucket>>					  m_DroppedBuckets;
@@ -427,6 +475,7 @@ private:
 	ZenCacheDiskLayer(const ZenCacheDiskLayer&) = delete;
 	ZenCacheDiskLayer& operator=(const ZenCacheDiskLayer&) = delete;
 
+	friend class DiskBucketStoreCompactor;
 	friend class DiskBucketReferenceChecker;
 };
 
diff --git a/src/zenserver/cache/structuredcachestore.cpp b/src/zenserver/cache/structuredcachestore.cpp
index cc6fefc76..9155e209c 100644
--- a/src/zenserver/cache/structuredcachestore.cpp
+++ b/src/zenserver/cache/structuredcachestore.cpp
@@ -816,16 +816,28 @@ namespace testutils {
 		return {Key, Buffer};
 	}
 
+	struct FalseType
+	{
+		static const bool Enabled = false;
+	};
+	struct TrueType
+	{
+		static const bool Enabled = true;
+	};
+
 }  // namespace testutils
 
-TEST_CASE("z$.store")
+TEST_CASE_TEMPLATE("z$.store", ReferenceCaching, testutils::FalseType, testutils::TrueType)
 {
 	ScopedTemporaryDirectory TempDir;
 
 	GcManager Gc;
 
 	auto			  JobQueue = MakeJobQueue(1, "testqueue");
-	ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
+	ZenCacheNamespace Zcs(Gc,
+						  *JobQueue,
+						  TempDir.Path() / "cache",
+						  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 
 	const int kIterationCount = 100;
 
@@ -859,7 +871,7 @@ TEST_CASE("z$.store")
 	}
 }
 
-TEST_CASE("z$.size")
+TEST_CASE_TEMPLATE("z$.size", ReferenceCaching, testutils::FalseType, testutils::TrueType)
 {
 	auto JobQueue = MakeJobQueue(1, "testqueue");
 
@@ -881,7 +893,10 @@ TEST_CASE("z$.size")
 
 		{
 			GcManager		  Gc;
-			ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
+			ZenCacheNamespace Zcs(Gc,
+								  *JobQueue,
+								  TempDir.Path() / "cache",
+								  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 
 			CbObject CacheValue = CreateCacheValue(Zcs.GetConfig().DiskLayerConfig.BucketConfig.MemCacheSizeThreshold - 256);
 
@@ -915,7 +930,10 @@ TEST_CASE("z$.size")
 
 		{
 			GcManager		  Gc;
-			ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
+			ZenCacheNamespace Zcs(Gc,
+								  *JobQueue,
+								  TempDir.Path() / "cache",
+								  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 
 			const GcStorageSize SerializedSize = Zcs.StorageSize();
 			CHECK_EQ(SerializedSize.MemorySize, 0);
@@ -939,7 +957,10 @@ TEST_CASE("z$.size")
 
 		{
 			GcManager		  Gc;
-			ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
+			ZenCacheNamespace Zcs(Gc,
+								  *JobQueue,
+								  TempDir.Path() / "cache",
+								  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 
 			CbObject CacheValue = CreateCacheValue(Zcs.GetConfig().DiskLayerConfig.BucketConfig.MemCacheSizeThreshold + 64);
 
@@ -959,7 +980,10 @@ TEST_CASE("z$.size")
 
 		{
 			GcManager		  Gc;
-			ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
+			ZenCacheNamespace Zcs(Gc,
+								  *JobQueue,
+								  TempDir.Path() / "cache",
+								  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 
 			const GcStorageSize SerializedSize = Zcs.StorageSize();
 			CHECK_EQ(SerializedSize.MemorySize, 0);
@@ -974,7 +998,7 @@ TEST_CASE("z$.size")
 	}
 }
 
-TEST_CASE("z$.gc")
+TEST_CASE_TEMPLATE("z$.gc", ReferenceCaching, testutils::FalseType, testutils::TrueType)
 {
 	using namespace testutils;
 
@@ -1001,7 +1025,7 @@ TEST_CASE("z$.gc")
 			ZenCacheNamespace Zcs(Gc,
 								  *JobQueue,
 								  TempDir.Path() / "cache",
-								  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = true}}});
+								  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 			const auto		  Bucket = "teardrinker"sv;
 
 			// Create a cache record
@@ -1041,7 +1065,7 @@ TEST_CASE("z$.gc")
 			ZenCacheNamespace	Zcs(Gc,
 									*JobQueue,
 									TempDir.Path() / "cache",
-									{.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = true}}});
+									{.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 			std::vector<IoHash> Keep;
 
 			// Collect garbage with 1 hour max cache duration
@@ -1065,7 +1089,7 @@ TEST_CASE("z$.gc")
 		ZenCacheNamespace		 Zcs(Gc,
 								 *JobQueue,
 								 TempDir.Path() / "cache",
-								 {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = true}}});
+								 {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 		const auto				 Bucket		 = "fortysixandtwo"sv;
 		const GcClock::TimePoint CurrentTime = GcClock::Now();
 
@@ -1114,7 +1138,7 @@ TEST_CASE("z$.gc")
 			ZenCacheNamespace Zcs(Gc,
 								  *JobQueue,
 								  TempDir.Path() / "cache",
-								  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = true}}});
+								  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 			const auto		  Bucket = "rightintwo"sv;
 
 			std::vector<IoHash> Keys{CreateKey(1), CreateKey(2), CreateKey(3)};
@@ -1162,13 +1186,13 @@ TEST_CASE("z$.gc")
 			ZenCacheNamespace Zcs(Gc,
 								  *JobQueue,
 								  TempDir.Path() / "cache",
-								  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = true}}});
+								  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 			CHECK_EQ(0, Zcs.StorageSize().DiskSize);
 		}
 	}
 }
 
-TEST_CASE("z$.threadedinsert")	// * doctest::skip(true))
+TEST_CASE_TEMPLATE("z$.threadedinsert", ReferenceCaching, testutils::FalseType, testutils::TrueType)  // * doctest::skip(true))
 {
 	//	for (uint32_t i = 0; i < 100; ++i)
 	{
@@ -1219,7 +1243,10 @@ TEST_CASE("z$.threadedinsert")	// * doctest::skip(true))
 		WorkerThreadPool  ThreadPool(4);
 		GcManager		  Gc;
 		auto			  JobQueue = MakeJobQueue(1, "testqueue");
-		ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path(), {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = true}}});
+		ZenCacheNamespace Zcs(Gc,
+							  *JobQueue,
+							  TempDir.Path(),
+							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 
 		{
 			std::atomic<size_t> WorkCompleted = 0;
@@ -1648,7 +1675,7 @@ TEST_CASE("z$.drop.namespace")
 	}
 }
 
-TEST_CASE("z$.blocked.disklayer.put")
+TEST_CASE_TEMPLATE("z$.blocked.disklayer.put", ReferenceCaching, testutils::FalseType, testutils::TrueType)
 {
 	ScopedTemporaryDirectory TempDir;
 
@@ -1665,7 +1692,10 @@ TEST_CASE("z$.blocked.disklayer.put")
 
 	GcManager		  Gc;
 	auto			  JobQueue = MakeJobQueue(1, "testqueue");
-	ZenCacheNamespace Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
+	ZenCacheNamespace Zcs(Gc,
+						  *JobQueue,
+						  TempDir.Path() / "cache",
+						  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 
 	CbObject CacheValue = CreateCacheValue(64 * 1024 + 64);
 
@@ -1701,7 +1731,7 @@ TEST_CASE("z$.blocked.disklayer.put")
 	CHECK(memcmp(NewView.GetData(), Buffer2.GetData(), NewView.GetSize()) == 0);
 }
 
-TEST_CASE("z$.scrub")
+TEST_CASE_TEMPLATE("z$.scrub", ReferenceCaching, testutils::FalseType, testutils::TrueType)
 {
 	ScopedTemporaryDirectory TempDir;
 
@@ -1760,7 +1790,10 @@ TEST_CASE("z$.scrub")
 	GcManager			  Gc;
 	CidStore			  CidStore(Gc);
 	auto				  JobQueue = MakeJobQueue(1, "testqueue");
-	ZenCacheNamespace	  Zcs(Gc, *JobQueue, TempDir.Path() / "cache", {});
+	ZenCacheNamespace	  Zcs(Gc,
+						  *JobQueue,
+						  TempDir.Path() / "cache",
+						  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 	CidStoreConfiguration CidConfig = {.RootDirectory = TempDir.Path() / "cas", .TinyValueThreshold = 1024, .HugeValueThreshold = 4096};
 	CidStore.Initialize(CidConfig);
 
@@ -1795,7 +1828,7 @@ TEST_CASE("z$.scrub")
 	CHECK(ScrubCtx.BadCids().GetSize() == 0);
 }
 
-TEST_CASE("z$.newgc.basics")
+TEST_CASE_TEMPLATE("z$.newgc.basics", ReferenceCaching, testutils::FalseType, testutils::TrueType)
 {
 	using namespace testutils;
 
@@ -1915,7 +1948,7 @@ TEST_CASE("z$.newgc.basics")
 		ZenCacheNamespace Zcs(Gc,
 							  *JobQueue,
 							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = true}}});
+							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 
 		// Create some basic data
 		{
@@ -1949,7 +1982,7 @@ TEST_CASE("z$.newgc.basics")
 		ZenCacheNamespace Zcs(Gc,
 							  *JobQueue,
 							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = true}}});
+							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		GcResult Result = Gc.CollectGarbage(GcSettings{.CacheExpireTime		   = GcClock::Now() - std::chrono::hours(1),
@@ -1957,14 +1990,14 @@ TEST_CASE("z$.newgc.basics")
 													   .CollectSmallObjects	   = false,
 													   .IsDeleteMode		   = false,
 													   .Verbose				   = true});
-		CHECK_EQ(7u, Result.ReferencerStat.Count);
-		CHECK_EQ(0u, Result.ReferencerStat.Expired);
-		CHECK_EQ(0u, Result.ReferencerStat.Deleted);
-		CHECK_EQ(5u, Result.ReferenceStoreStat.Count);
-		CHECK_EQ(0u, Result.ReferenceStoreStat.Pruned);
-		CHECK_EQ(0u, Result.ReferenceStoreStat.Compacted);
-		CHECK_EQ(0u, Result.RemovedDisk);
-		CHECK_EQ(0u, Result.RemovedMemory);
+		CHECK_EQ(7u, Result.ReferencerStatSum.RemoveExpiredDataStats.CheckedCount);
+		CHECK_EQ(0u, Result.ReferencerStatSum.RemoveExpiredDataStats.FoundCount);
+		CHECK_EQ(0u, Result.ReferencerStatSum.RemoveExpiredDataStats.DeletedCount);
+		CHECK_EQ(5u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.CheckedCount);
+		CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.FoundCount);
+		CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.DeletedCount);
+		CHECK_EQ(0u, Result.CompactStoresStatSum.RemovedDisk);
+		CHECK_EQ(0u, Result.ReferencerStatSum.RemoveExpiredDataStats.FreedMemory);
 
 		CHECK(ValidateCacheEntry(Zcs, CidStore, TearDrinkerBucket, CacheRecords[0], true, true));
 		CHECK(ValidateCacheEntry(Zcs, CidStore, TearDrinkerBucket, CacheRecords[1], true, true));
@@ -1983,7 +2016,7 @@ TEST_CASE("z$.newgc.basics")
 		ZenCacheNamespace Zcs(Gc,
 							  *JobQueue,
 							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = true}}});
+							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		GcResult Result = Gc.CollectGarbage(GcSettings{.CacheExpireTime		   = GcClock::Now() + std::chrono::hours(1),
@@ -1991,14 +2024,14 @@ TEST_CASE("z$.newgc.basics")
 													   .CollectSmallObjects	   = false,
 													   .IsDeleteMode		   = false,
 													   .Verbose				   = true});
-		CHECK_EQ(7u, Result.ReferencerStat.Count);
-		CHECK_EQ(1u, Result.ReferencerStat.Expired);
-		CHECK_EQ(0u, Result.ReferencerStat.Deleted);
-		CHECK_EQ(5u, Result.ReferenceStoreStat.Count);
-		CHECK_EQ(0u, Result.ReferenceStoreStat.Pruned);
-		CHECK_EQ(0u, Result.ReferenceStoreStat.Compacted);
-		CHECK_EQ(0u, Result.RemovedDisk);
-		CHECK_EQ(0u, Result.RemovedMemory);
+		CHECK_EQ(7u, Result.ReferencerStatSum.RemoveExpiredDataStats.CheckedCount);
+		CHECK_EQ(1u, Result.ReferencerStatSum.RemoveExpiredDataStats.FoundCount);
+		CHECK_EQ(0u, Result.ReferencerStatSum.RemoveExpiredDataStats.DeletedCount);
+		CHECK_EQ(5u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.CheckedCount);
+		CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.FoundCount);
+		CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.DeletedCount);
+		CHECK_EQ(0u, Result.CompactStoresStatSum.RemovedDisk);
+		CHECK_EQ(0u, Result.ReferencerStatSum.RemoveExpiredDataStats.FreedMemory);
 
 		CHECK(ValidateCacheEntry(Zcs, CidStore, TearDrinkerBucket, CacheRecords[0], true, true));
 		CHECK(ValidateCacheEntry(Zcs, CidStore, TearDrinkerBucket, CacheRecords[1], true, true));
@@ -2017,7 +2050,7 @@ TEST_CASE("z$.newgc.basics")
 		ZenCacheNamespace Zcs(Gc,
 							  *JobQueue,
 							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = true}}});
+							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		GcResult Result = Gc.CollectGarbage(GcSettings{.CacheExpireTime		   = GcClock::Now() + std::chrono::hours(1),
@@ -2025,14 +2058,14 @@ TEST_CASE("z$.newgc.basics")
 													   .CollectSmallObjects	   = true,
 													   .IsDeleteMode		   = false,
 													   .Verbose				   = true});
-		CHECK_EQ(7u, Result.ReferencerStat.Count);
-		CHECK_EQ(7u, Result.ReferencerStat.Expired);
-		CHECK_EQ(0u, Result.ReferencerStat.Deleted);
-		CHECK_EQ(5u, Result.ReferenceStoreStat.Count);
-		CHECK_EQ(0u, Result.ReferenceStoreStat.Pruned);
-		CHECK_EQ(0u, Result.ReferenceStoreStat.Compacted);
-		CHECK_EQ(0u, Result.RemovedDisk);
-		CHECK_EQ(0u, Result.RemovedMemory);
+		CHECK_EQ(7u, Result.ReferencerStatSum.RemoveExpiredDataStats.CheckedCount);
+		CHECK_EQ(7u, Result.ReferencerStatSum.RemoveExpiredDataStats.FoundCount);
+		CHECK_EQ(0u, Result.ReferencerStatSum.RemoveExpiredDataStats.DeletedCount);
+		CHECK_EQ(5u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.CheckedCount);
+		CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.FoundCount);
+		CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.DeletedCount);
+		CHECK_EQ(0u, Result.CompactStoresStatSum.RemovedDisk);
+		CHECK_EQ(0u, Result.ReferencerStatSum.RemoveExpiredDataStats.FreedMemory);
 
 		CHECK(ValidateCacheEntry(Zcs, CidStore, TearDrinkerBucket, CacheRecords[0], true, true));
 		CHECK(ValidateCacheEntry(Zcs, CidStore, TearDrinkerBucket, CacheRecords[1], true, true));
@@ -2051,7 +2084,7 @@ TEST_CASE("z$.newgc.basics")
 		ZenCacheNamespace Zcs(Gc,
 							  *JobQueue,
 							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = true}}});
+							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		GcResult Result = Gc.CollectGarbage(GcSettings{.CacheExpireTime		   = GcClock::Now() + std::chrono::hours(1),
@@ -2060,14 +2093,14 @@ TEST_CASE("z$.newgc.basics")
 													   .IsDeleteMode		   = true,
 													   .SkipCidDelete		   = true,
 													   .Verbose				   = true});
-		CHECK_EQ(7u, Result.ReferencerStat.Count);
-		CHECK_EQ(1u, Result.ReferencerStat.Expired);
-		CHECK_EQ(1u, Result.ReferencerStat.Deleted);
-		CHECK_EQ(0u, Result.ReferenceStoreStat.Count);
-		CHECK_EQ(0u, Result.ReferenceStoreStat.Pruned);
-		CHECK_EQ(0u, Result.ReferenceStoreStat.Compacted);
-		CHECK_EQ(CacheEntries[UnstructuredCacheValues[2]].Data.GetSize(), Result.RemovedDisk);
-		CHECK_EQ(0u, Result.RemovedMemory);
+		CHECK_EQ(7u, Result.ReferencerStatSum.RemoveExpiredDataStats.CheckedCount);
+		CHECK_EQ(1u, Result.ReferencerStatSum.RemoveExpiredDataStats.FoundCount);
+		CHECK_EQ(1u, Result.ReferencerStatSum.RemoveExpiredDataStats.DeletedCount);
+		CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.CheckedCount);
+		CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.FoundCount);
+		CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.DeletedCount);
+		CHECK_EQ(CacheEntries[UnstructuredCacheValues[2]].Data.GetSize(), Result.CompactStoresStatSum.RemovedDisk);
+		CHECK_EQ(0u, Result.ReferencerStatSum.RemoveExpiredDataStats.FreedMemory);
 
 		CHECK(ValidateCacheEntry(Zcs, CidStore, TearDrinkerBucket, CacheRecords[0], true, true));
 		CHECK(ValidateCacheEntry(Zcs, CidStore, TearDrinkerBucket, CacheRecords[1], true, true));
@@ -2086,7 +2119,7 @@ TEST_CASE("z$.newgc.basics")
 		ZenCacheNamespace Zcs(Gc,
 							  *JobQueue,
 							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = true}}});
+							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		GcResult Result = Gc.CollectGarbage(GcSettings{.CacheExpireTime		   = GcClock::Now() + std::chrono::hours(1),
@@ -2095,14 +2128,14 @@ TEST_CASE("z$.newgc.basics")
 													   .IsDeleteMode		   = true,
 													   .SkipCidDelete		   = true,
 													   .Verbose				   = true});
-		CHECK_EQ(7u, Result.ReferencerStat.Count);
-		CHECK_EQ(7u, Result.ReferencerStat.Expired);
-		CHECK_EQ(7u, Result.ReferencerStat.Deleted);
-		CHECK_EQ(0u, Result.ReferenceStoreStat.Count);
-		CHECK_EQ(0u, Result.ReferenceStoreStat.Pruned);
-		CHECK_EQ(0u, Result.ReferenceStoreStat.Compacted);
-		CHECK_GE(Result.RemovedDisk, 0);
-		CHECK_EQ(0u, Result.RemovedMemory);
+		CHECK_EQ(7u, Result.ReferencerStatSum.RemoveExpiredDataStats.CheckedCount);
+		CHECK_EQ(7u, Result.ReferencerStatSum.RemoveExpiredDataStats.FoundCount);
+		CHECK_EQ(7u, Result.ReferencerStatSum.RemoveExpiredDataStats.DeletedCount);
+		CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.CheckedCount);
+		CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.FoundCount);
+		CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.DeletedCount);
+		CHECK_GE(Result.CompactStoresStatSum.RemovedDisk, 0);
+		CHECK_EQ(0u, Result.ReferencerStatSum.RemoveExpiredDataStats.FreedMemory);
 
 		CHECK(ValidateCacheEntry(Zcs, CidStore, TearDrinkerBucket, CacheRecords[0], false, true));
 		CHECK(ValidateCacheEntry(Zcs, CidStore, TearDrinkerBucket, CacheRecords[1], false, true));
@@ -2121,7 +2154,7 @@ TEST_CASE("z$.newgc.basics")
 		ZenCacheNamespace Zcs(Gc,
 							  *JobQueue,
 							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = true}}});
+							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		GcResult Result = Gc.CollectGarbage(GcSettings{.CacheExpireTime		   = GcClock::Now() + std::chrono::hours(1),
@@ -2130,17 +2163,20 @@ TEST_CASE("z$.newgc.basics")
 													   .IsDeleteMode		   = true,
 													   .SkipCidDelete		   = false,
 													   .Verbose				   = true});
-		CHECK_EQ(7u, Result.ReferencerStat.Count);
-		CHECK_EQ(1u, Result.ReferencerStat.Expired);  // Only one cache value is pruned/deleted as that is the only large item in the cache
-													  // (all other large items as in cas)
-		CHECK_EQ(1u, Result.ReferencerStat.Deleted);
-		CHECK_EQ(5u, Result.ReferenceStoreStat.Count);
+		CHECK_EQ(7u, Result.ReferencerStatSum.RemoveExpiredDataStats.CheckedCount);
+		CHECK_EQ(1u,
+				 Result.ReferencerStatSum.RemoveExpiredDataStats.FoundCount);  // Only one cache value is pruned/deleted as that is the only
+																			   // large item in the cache (all other large items as in cas)
+		CHECK_EQ(1u, Result.ReferencerStatSum.RemoveExpiredDataStats.DeletedCount);
+		CHECK_EQ(5u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.CheckedCount);
+		CHECK_EQ(0u,
+				 Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats
+					 .FoundCount);	// We won't remove any references since all referencers are small which retains all references
 		CHECK_EQ(0u,
-				 Result.ReferenceStoreStat
-					 .Pruned);	// We won't remove any references since all referencers are small which retains all references
-		CHECK_EQ(0u, Result.ReferenceStoreStat.Compacted);
-		CHECK_EQ(CacheEntries[UnstructuredCacheValues[2]].Data.GetSize(), Result.RemovedDisk);
-		CHECK_EQ(0u, Result.RemovedMemory);
+				 Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats
+					 .DeletedCount);  // We won't remove any references since all referencers are small which retains all references
+		CHECK_EQ(CacheEntries[UnstructuredCacheValues[2]].Data.GetSize(), Result.CompactStoresStatSum.RemovedDisk);
+		CHECK_EQ(0u, Result.ReferencerStatSum.RemoveExpiredDataStats.FreedMemory);
 
 		CHECK(ValidateCacheEntry(Zcs, CidStore, TearDrinkerBucket, CacheRecords[0], true, true));
 		CHECK(ValidateCacheEntry(Zcs, CidStore, TearDrinkerBucket, CacheRecords[1], true, true));
@@ -2159,7 +2195,7 @@ TEST_CASE("z$.newgc.basics")
 		ZenCacheNamespace Zcs(Gc,
 							  *JobQueue,
 							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = true}}});
+							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		GcResult Result = Gc.CollectGarbage(GcSettings{.CacheExpireTime		   = GcClock::Now() + std::chrono::hours(1),
@@ -2168,14 +2204,14 @@ TEST_CASE("z$.newgc.basics")
 													   .IsDeleteMode		   = true,
 													   .SkipCidDelete		   = false,
 													   .Verbose				   = true});
-		CHECK_EQ(7u, Result.ReferencerStat.Count);
-		CHECK_EQ(7u, Result.ReferencerStat.Expired);
-		CHECK_EQ(7u, Result.ReferencerStat.Deleted);
-		CHECK_EQ(5u, Result.ReferenceStoreStat.Count);
-		CHECK_EQ(5u, Result.ReferenceStoreStat.Pruned);
-		CHECK_EQ(5u, Result.ReferenceStoreStat.Compacted);
-		CHECK_GT(Result.RemovedDisk, 0);
-		CHECK_EQ(0u, Result.RemovedMemory);
+		CHECK_EQ(7u, Result.ReferencerStatSum.RemoveExpiredDataStats.CheckedCount);
+		CHECK_EQ(7u, Result.ReferencerStatSum.RemoveExpiredDataStats.FoundCount);
+		CHECK_EQ(7u, Result.ReferencerStatSum.RemoveExpiredDataStats.DeletedCount);
+		CHECK_EQ(5u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.CheckedCount);
+		CHECK_EQ(5u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.FoundCount);
+		CHECK_EQ(5u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.DeletedCount);
+		CHECK_GT(Result.CompactStoresStatSum.RemovedDisk, 0);
+		CHECK_EQ(0u, Result.ReferencerStatSum.RemoveExpiredDataStats.FreedMemory);
 
 		CHECK(ValidateCacheEntry(Zcs, CidStore, TearDrinkerBucket, CacheRecords[0], false, false));
 		CHECK(ValidateCacheEntry(Zcs, CidStore, TearDrinkerBucket, CacheRecords[1], false, false));
@@ -2195,25 +2231,27 @@ TEST_CASE("z$.newgc.basics")
 		ZenCacheNamespace Zcs(Gc,
 							  *JobQueue,
 							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = true}}});
+							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		Zcs.SetAccessTime(TearDrinkerBucket, CacheRecords[0], GcClock::Now() + std::chrono::hours(2));
 
-		GcResult Result = Gc.CollectGarbage(GcSettings{.CacheExpireTime		   = GcClock::Now() + std::chrono::hours(1),
-													   .ProjectStoreExpireTime = GcClock::Now() + std::chrono::hours(1),
-													   .CollectSmallObjects	   = true,
-													   .IsDeleteMode		   = true,
-													   .SkipCidDelete		   = true,
-													   .Verbose				   = true});
-		CHECK_EQ(7u, Result.ReferencerStat.Count);
-		CHECK_EQ(6u, Result.ReferencerStat.Expired);
-		CHECK_EQ(6u, Result.ReferencerStat.Deleted);
-		CHECK_EQ(0u, Result.ReferenceStoreStat.Count);
-		CHECK_EQ(0u, Result.ReferenceStoreStat.Pruned);
-		CHECK_EQ(0u, Result.ReferenceStoreStat.Compacted);
-		CHECK_GT(Result.RemovedDisk, 0);
-		CHECK_EQ(0u, Result.RemovedMemory);
+		GcResult Result = Gc.CollectGarbage(GcSettings{.CacheExpireTime					  = GcClock::Now() + std::chrono::hours(1),
+													   .ProjectStoreExpireTime			  = GcClock::Now() + std::chrono::hours(1),
+													   .CollectSmallObjects				  = true,
+													   .IsDeleteMode					  = true,
+													   .SkipCidDelete					  = true,
+													   .Verbose							  = true,
+													   .CompactBlockUsageThresholdPercent = 100});
+		CHECK_EQ(7u, Result.ReferencerStatSum.RemoveExpiredDataStats.CheckedCount);
+		CHECK_EQ(6u, Result.ReferencerStatSum.RemoveExpiredDataStats.FoundCount);
+		CHECK_EQ(6u, Result.ReferencerStatSum.RemoveExpiredDataStats.DeletedCount);
+		CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.CheckedCount);
+		CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.FoundCount);
+		CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.DeletedCount);
+		uint64_t MinExpectedRemoveSize = CacheEntries[UnstructuredCacheValues[2]].Data.GetSize();
+		CHECK_LT(MinExpectedRemoveSize, Result.CompactStoresStatSum.RemovedDisk);
+		CHECK_EQ(0u, Result.ReferencerStatSum.RemoveExpiredDataStats.FreedMemory);
 
 		CHECK(ValidateCacheEntry(Zcs, CidStore, TearDrinkerBucket, CacheRecords[0], true, true));
 		CHECK(ValidateCacheEntry(Zcs, CidStore, TearDrinkerBucket, CacheRecords[1], false, true));
@@ -2233,7 +2271,7 @@ TEST_CASE("z$.newgc.basics")
 		ZenCacheNamespace Zcs(Gc,
 							  *JobQueue,
 							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = true}}});
+							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		Zcs.SetAccessTime(TearDrinkerBucket, CacheRecords[0], GcClock::Now() + std::chrono::hours(2));
@@ -2245,14 +2283,14 @@ TEST_CASE("z$.newgc.basics")
 													   .IsDeleteMode		   = true,
 													   .SkipCidDelete		   = false,
 													   .Verbose				   = true});
-		CHECK_EQ(7u, Result.ReferencerStat.Count);
-		CHECK_EQ(5u, Result.ReferencerStat.Expired);
-		CHECK_EQ(5u, Result.ReferencerStat.Deleted);
-		CHECK_EQ(5u, Result.ReferenceStoreStat.Count);
-		CHECK_EQ(0u, Result.ReferenceStoreStat.Pruned);
-		CHECK_EQ(0u, Result.ReferenceStoreStat.Compacted);
-		CHECK_GT(Result.RemovedDisk, 0);
-		CHECK_EQ(0u, Result.RemovedMemory);
+		CHECK_EQ(7u, Result.ReferencerStatSum.RemoveExpiredDataStats.CheckedCount);
+		CHECK_EQ(5u, Result.ReferencerStatSum.RemoveExpiredDataStats.FoundCount);
+		CHECK_EQ(5u, Result.ReferencerStatSum.RemoveExpiredDataStats.DeletedCount);
+		CHECK_EQ(5u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.CheckedCount);
+		CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.FoundCount);
+		CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.DeletedCount);
+		CHECK_GT(Result.CompactStoresStatSum.RemovedDisk, 0);
+		CHECK_EQ(0u, Result.ReferencerStatSum.RemoveExpiredDataStats.FreedMemory);
 
 		CHECK(ValidateCacheEntry(Zcs, CidStore, TearDrinkerBucket, CacheRecords[0], true, true));
 		CHECK(ValidateCacheEntry(Zcs, CidStore, TearDrinkerBucket, CacheRecords[1], true, true));
@@ -2272,7 +2310,7 @@ TEST_CASE("z$.newgc.basics")
 		ZenCacheNamespace Zcs(Gc,
 							  *JobQueue,
 							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = true}}});
+							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		Zcs.SetAccessTime(TearDrinkerBucket, UnstructuredCacheValues[1], GcClock::Now() + std::chrono::hours(2));
@@ -2285,14 +2323,14 @@ TEST_CASE("z$.newgc.basics")
 													   .IsDeleteMode		   = true,
 													   .SkipCidDelete		   = false,
 													   .Verbose				   = true});
-		CHECK_EQ(7u, Result.ReferencerStat.Count);
-		CHECK_EQ(4u, Result.ReferencerStat.Expired);
-		CHECK_EQ(4u, Result.ReferencerStat.Deleted);
-		CHECK_EQ(5u, Result.ReferenceStoreStat.Count);
-		CHECK_EQ(5u, Result.ReferenceStoreStat.Pruned);
-		CHECK_EQ(5u, Result.ReferenceStoreStat.Compacted);
-		CHECK_GT(Result.RemovedDisk, 0);
-		CHECK_EQ(0u, Result.RemovedMemory);
+		CHECK_EQ(7u, Result.ReferencerStatSum.RemoveExpiredDataStats.CheckedCount);
+		CHECK_EQ(4u, Result.ReferencerStatSum.RemoveExpiredDataStats.FoundCount);
+		CHECK_EQ(4u, Result.ReferencerStatSum.RemoveExpiredDataStats.DeletedCount);
+		CHECK_EQ(5u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.CheckedCount);
+		CHECK_EQ(5u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.FoundCount);
+		CHECK_EQ(5u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.DeletedCount);
+		CHECK_GT(Result.CompactStoresStatSum.RemovedDisk, 0);
+		CHECK_EQ(0u, Result.ReferencerStatSum.RemoveExpiredDataStats.FreedMemory);
 
 		CHECK(ValidateCacheEntry(Zcs, CidStore, TearDrinkerBucket, CacheRecords[0], false, false));
 		CHECK(ValidateCacheEntry(Zcs, CidStore, TearDrinkerBucket, CacheRecords[1], false, false));
@@ -2312,7 +2350,7 @@ TEST_CASE("z$.newgc.basics")
 		ZenCacheNamespace Zcs(Gc,
 							  *JobQueue,
 							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = true}}});
+							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		// Prime so we can check GC of memory layer
@@ -2329,22 +2367,23 @@ TEST_CASE("z$.newgc.basics")
 		Zcs.SetAccessTime(TearDrinkerBucket, UnstructuredCacheValues[2], GcClock::Now() + std::chrono::hours(2));
 		Zcs.SetAccessTime(TearDrinkerBucket, UnstructuredCacheValues[3], GcClock::Now() + std::chrono::hours(2));
 
-		GcResult Result = Gc.CollectGarbage(GcSettings{.CacheExpireTime		   = GcClock::Now() + std::chrono::hours(1),
-													   .ProjectStoreExpireTime = GcClock::Now() + std::chrono::hours(1),
-													   .CollectSmallObjects	   = true,
-													   .IsDeleteMode		   = true,
-													   .SkipCidDelete		   = true,
-													   .Verbose				   = true});
-		CHECK_EQ(7u, Result.ReferencerStat.Count);
-		CHECK_EQ(4u, Result.ReferencerStat.Expired);
-		CHECK_EQ(4u, Result.ReferencerStat.Deleted);
-		CHECK_EQ(0u, Result.ReferenceStoreStat.Count);
-		CHECK_EQ(0u, Result.ReferenceStoreStat.Pruned);
-		CHECK_EQ(0u, Result.ReferenceStoreStat.Compacted);
-		CHECK_GT(Result.RemovedDisk, 0);
+		GcResult Result = Gc.CollectGarbage(GcSettings{.CacheExpireTime					  = GcClock::Now() + std::chrono::hours(1),
+													   .ProjectStoreExpireTime			  = GcClock::Now() + std::chrono::hours(1),
+													   .CollectSmallObjects				  = true,
+													   .IsDeleteMode					  = true,
+													   .SkipCidDelete					  = true,
+													   .Verbose							  = true,
+													   .CompactBlockUsageThresholdPercent = 100});
+		CHECK_EQ(7u, Result.ReferencerStatSum.RemoveExpiredDataStats.CheckedCount);
+		CHECK_EQ(4u, Result.ReferencerStatSum.RemoveExpiredDataStats.FoundCount);
+		CHECK_EQ(4u, Result.ReferencerStatSum.RemoveExpiredDataStats.DeletedCount);
+		CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.CheckedCount);
+		CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.FoundCount);
+		CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.DeletedCount);
+		CHECK_GT(Result.CompactStoresStatSum.RemovedDisk, 0);
 		uint64_t MemoryClean = CacheEntries[CacheRecords[0]].Data.GetSize() + CacheEntries[CacheRecords[1]].Data.GetSize() +
 							   CacheEntries[CacheRecords[2]].Data.GetSize() + CacheEntries[UnstructuredCacheValues[0]].Data.GetSize();
-		CHECK_EQ(MemoryClean, Result.RemovedMemory);
+		CHECK_EQ(MemoryClean, Result.ReferencerStatSum.RemoveExpiredDataStats.FreedMemory);
 
 		CHECK(ValidateCacheEntry(Zcs, CidStore, TearDrinkerBucket, CacheRecords[0], false, true));
 		CHECK(ValidateCacheEntry(Zcs, CidStore, TearDrinkerBucket, CacheRecords[1], false, true));
@@ -2364,7 +2403,7 @@ TEST_CASE("z$.newgc.basics")
 		ZenCacheNamespace Zcs(Gc,
 							  *JobQueue,
 							  TempDir.Path() / "cache",
-							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = true}}});
+							  {.DiskLayerConfig = {.BucketConfig = {.EnableReferenceCaching = ReferenceCaching::Enabled}}});
 		CHECK_EQ(7, Zcs.GetBucketInfo(TearDrinkerBucket).value().DiskLayerInfo.EntryCount);
 
 		auto Attachments =
@@ -2393,15 +2432,17 @@ TEST_CASE("z$.newgc.basics")
 													   .IsDeleteMode		   = true,
 													   .SkipCidDelete		   = false,
 													   .Verbose				   = true});
-		CHECK_EQ(8u, Result.ReferencerStat.Count);
-		CHECK_EQ(1u, Result.ReferencerStat.Expired);
-		CHECK_EQ(1u, Result.ReferencerStat.Deleted);
-		CHECK_EQ(9u, Result.ReferenceStoreStat.Count);
-		CHECK_EQ(4u, Result.ReferenceStoreStat.Pruned);
-		CHECK_EQ(4u, Result.ReferenceStoreStat.Compacted);
-		CHECK_EQ(Attachments[1].second.GetCompressed().GetSize() + Attachments[3].second.GetCompressed().GetSize(), Result.RemovedDisk);
+		// Write block can't be compacted so Compacted will be less than Deleted
+		CHECK_EQ(8u, Result.ReferencerStatSum.RemoveExpiredDataStats.CheckedCount);
+		CHECK_EQ(1u, Result.ReferencerStatSum.RemoveExpiredDataStats.FoundCount);
+		CHECK_EQ(1u, Result.ReferencerStatSum.RemoveExpiredDataStats.DeletedCount);
+		CHECK_EQ(9u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.CheckedCount);
+		CHECK_EQ(4u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.FoundCount);
+		CHECK_EQ(4u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.DeletedCount);
+		CHECK_EQ(Attachments[1].second.GetCompressed().GetSize() + Attachments[3].second.GetCompressed().GetSize(),
+				 Result.CompactStoresStatSum.RemovedDisk);
 		uint64_t MemoryClean = CacheEntries[CacheRecord].Data.GetSize();
-		CHECK_EQ(MemoryClean, Result.RemovedMemory);
+		CHECK_EQ(MemoryClean, Result.ReferencerStatSum.RemoveExpiredDataStats.FreedMemory);
 	}
 }
 
diff --git a/src/zenserver/config.cpp b/src/zenserver/config.cpp
index 08ba6dc95..5f2c3351e 100644
--- a/src/zenserver/config.cpp
+++ b/src/zenserver/config.cpp
@@ -2,12 +2,14 @@
 
 #include "config.h"
 
+#include "config/luaconfig.h"
 #include "diag/logging.h"
 
 #include <zencore/crypto.h>
 #include <zencore/except.h>
 #include <zencore/fmtutils.h>
 #include <zencore/iobuffer.h>
+#include <zencore/logging.h>
 #include <zencore/string.h>
 #include <zenhttp/zenhttp.h>
 #include <zenutil/basicfile.h>
@@ -175,592 +177,156 @@ MakeSafePath(const std::string_view Path)
 #endif
 };
 
-namespace LuaConfig {
-
-	void EscapeBackslash(std::string& InOutString)
+class CachePolicyOption : public LuaConfig::OptionValue
+{
+public:
+	CachePolicyOption(UpstreamCachePolicy& Value) : Value(Value) {}
+	virtual void Print(std::string_view, zen::StringBuilderBase& StringBuilder) override
 	{
-		std::size_t BackslashPos = InOutString.find('\\');
-		if (BackslashPos != std::string::npos)
+		switch (Value)
 		{
-			std::size_t						  Offset = 0;
-			zen::ExtendableStringBuilder<512> PathBuilder;
-			while (BackslashPos != std::string::npos)
-			{
-				PathBuilder.Append(InOutString.substr(Offset, BackslashPos + 1 - Offset));
-				PathBuilder.Append('\\');
-				Offset		 = BackslashPos + 1;
-				BackslashPos = InOutString.find('\\', Offset);
-			}
-			PathBuilder.Append(InOutString.substr(Offset, BackslashPos));
-			InOutString = PathBuilder.ToString();
+			case UpstreamCachePolicy::Read:
+				StringBuilder.Append("readonly");
+				break;
+			case UpstreamCachePolicy::Write:
+				StringBuilder.Append("writeonly");
+				break;
+			case UpstreamCachePolicy::Disabled:
+				StringBuilder.Append("disabled");
+				break;
+			case UpstreamCachePolicy::ReadWrite:
+				StringBuilder.Append("readwrite");
+				break;
+			default:
+				ZEN_ASSERT(false);
 		}
 	}
-
-	class OptionValue
-	{
-	public:
-		virtual void Print(std::string_view Indent, zen::StringBuilderBase& StringBuilder) = 0;
-		virtual void Parse(sol::object Object)											   = 0;
-
-		virtual ~OptionValue() {}
-	};
-
-	typedef std::shared_ptr<OptionValue> TOptionValue;
-
-	class StringOption : public OptionValue
-	{
-	public:
-		StringOption(std::string& Value) : Value(Value) {}
-		virtual void Print(std::string_view, zen::StringBuilderBase& StringBuilder) override
-		{
-			StringBuilder.Append(fmt::format("\"{}\"", Value));
-		}
-		virtual void Parse(sol::object Object) override { Value = Object.as<std::string>(); }
-		std::string& Value;
-	};
-
-	class FilePathOption : public OptionValue
+	virtual void Parse(sol::object Object) override
 	{
-	public:
-		FilePathOption(std::filesystem::path& Value) : Value(Value) {}
-		virtual void Print(std::string_view, zen::StringBuilderBase& StringBuilder) override
+		std::string PolicyString = Object.as<std::string>();
+		if (PolicyString == "readonly")
 		{
-			std::string Path = Value.string();
-			EscapeBackslash(Path);
-			StringBuilder.Append(fmt::format("\"{}\"", Path));
+			Value = UpstreamCachePolicy::Read;
 		}
-		virtual void Parse(sol::object Object) override
+		else if (PolicyString == "writeonly")
 		{
-			std::string Str = Object.as<std::string>();
-			if (!Str.empty())
-			{
-				Value = MakeSafePath(Str);
-			}
+			Value = UpstreamCachePolicy::Write;
 		}
-		std::filesystem::path& Value;
-	};
-
-	class BoolOption : public OptionValue
-	{
-	public:
-		BoolOption(bool& Value) : Value(Value) {}
-		virtual void Print(std::string_view, zen::StringBuilderBase& StringBuilder) override
+		else if (PolicyString == "disabled")
 		{
-			StringBuilder.Append(Value ? "true" : "false");
+			Value = UpstreamCachePolicy::Disabled;
 		}
-		virtual void Parse(sol::object Object) override { Value = Object.as<bool>(); }
-		bool&		 Value;
-	};
-
-	class CachePolicyOption : public OptionValue
-	{
-	public:
-		CachePolicyOption(UpstreamCachePolicy& Value) : Value(Value) {}
-		virtual void Print(std::string_view, zen::StringBuilderBase& StringBuilder) override
+		else if (PolicyString == "readwrite")
 		{
-			switch (Value)
-			{
-				case UpstreamCachePolicy::Read:
-					StringBuilder.Append("readonly");
-					break;
-				case UpstreamCachePolicy::Write:
-					StringBuilder.Append("writeonly");
-					break;
-				case UpstreamCachePolicy::Disabled:
-					StringBuilder.Append("disabled");
-					break;
-				case UpstreamCachePolicy::ReadWrite:
-					StringBuilder.Append("readwrite");
-					break;
-				default:
-					ZEN_ASSERT(false);
-			}
+			Value = UpstreamCachePolicy::ReadWrite;
 		}
-		virtual void Parse(sol::object Object) override
-		{
-			std::string PolicyString = Object.as<std::string>();
-			if (PolicyString == "readonly")
-			{
-				Value = UpstreamCachePolicy::Read;
-			}
-			else if (PolicyString == "writeonly")
-			{
-				Value = UpstreamCachePolicy::Write;
-			}
-			else if (PolicyString == "disabled")
-			{
-				Value = UpstreamCachePolicy::Disabled;
-			}
-			else if (PolicyString == "readwrite")
-			{
-				Value = UpstreamCachePolicy::ReadWrite;
-			}
-		}
-		UpstreamCachePolicy& Value;
-	};
-
-	template<Integral T>
-	class NumberOption : public OptionValue
-	{
-	public:
-		NumberOption(T& Value) : Value(Value) {}
-		virtual void Print(std::string_view, zen::StringBuilderBase& StringBuilder) override
-		{
-			StringBuilder.Append(fmt::format("{}", Value));
-		}
-		virtual void Parse(sol::object Object) override { Value = Object.as<T>(); }
-		T&			 Value;
-	};
+	}
+	UpstreamCachePolicy& Value;
+};
 
-	class LuaContainerWriter
+class ZenAuthConfigOption : public LuaConfig::OptionValue
+{
+public:
+	ZenAuthConfigOption(ZenAuthConfig& Value) : Value(Value) {}
+	virtual void Print(std::string_view Indent, zen::StringBuilderBase& StringBuilder) override
 	{
-	public:
-		LuaContainerWriter(zen::StringBuilderBase& StringBuilder, std::string_view Indent)
-		: StringBuilder(StringBuilder)
-		, InitialIndent(Indent.length())
-		, LocalIndent(Indent)
+		if (Value.OpenIdProviders.empty())
 		{
-			StringBuilder.Append("{\n");
-			LocalIndent.push_back('\t');
-		}
-		~LuaContainerWriter()
-		{
-			LocalIndent.pop_back();
-			StringBuilder.Append(LocalIndent);
-			StringBuilder.Append("}");
-		}
-
-		void BeginContainer(std::string_view Name)
-		{
-			StringBuilder.Append(LocalIndent);
-			if (!Name.empty())
-			{
-				StringBuilder.Append(Name);
-				StringBuilder.Append(" = {\n");
-			}
-			else
-			{
-				StringBuilder.Append("{\n");
-			}
-			LocalIndent.push_back('\t');
+			StringBuilder.Append("{}");
+			return;
 		}
-		void WriteValue(std::string_view Name, std::string_view Value)
+		LuaConfig::LuaContainerWriter Writer(StringBuilder, Indent);
+		for (const ZenOpenIdProviderConfig& Config : Value.OpenIdProviders)
 		{
-			if (Name.empty())
-			{
-				StringBuilder.Append(fmt::format("{}\"{}\",\n", LocalIndent, Value));
-			}
-			else
+			Writer.BeginContainer("");
 			{
-				StringBuilder.Append(fmt::format("{}{} = \"{}\",\n", LocalIndent, Name, Value));
+				Writer.WriteValue("name", Config.Name);
+				Writer.WriteValue("url", Config.Url);
+				Writer.WriteValue("clientid", Config.ClientId);
 			}
+			Writer.EndContainer();
 		}
-		void EndContainer()
-		{
-			LocalIndent.pop_back();
-			StringBuilder.Append(LocalIndent);
-			StringBuilder.Append("}");
-			StringBuilder.Append(",\n");
-		}
-
-	private:
-		zen::StringBuilderBase& StringBuilder;
-		const std::size_t		InitialIndent;
-		std::string				LocalIndent;
-	};
-
-	class StringArrayOption : public OptionValue
+	}
+	virtual void Parse(sol::object Object) override
 	{
-	public:
-		StringArrayOption(std::vector<std::string>& Value) : Value(Value) {}
-		virtual void Print(std::string_view Indent, zen::StringBuilderBase& StringBuilder) override
-		{
-			if (Value.empty())
-			{
-				StringBuilder.Append("{}");
-			}
-			if (Value.size() == 1)
-			{
-				StringBuilder.Append(fmt::format("\"{}\"", Value[0]));
-			}
-			else
-			{
-				LuaContainerWriter Writer(StringBuilder, Indent);
-				for (std::string String : Value)
-				{
-					Writer.WriteValue("", String);
-				}
-			}
-		}
-		virtual void Parse(sol::object Object) override
+		if (sol::optional<sol::table> OpenIdProviders = Object.as<sol::table>())
 		{
-			if (Object.get_type() == sol::type::string)
+			for (const auto& Kv : OpenIdProviders.value())
 			{
-				Value.push_back(Object.as<std::string>());
-			}
-			else if (Object.get_type() == sol::type::table)
-			{
-				for (const auto& Kv : Object.as<sol::table>())
+				if (sol::optional<sol::table> OpenIdProvider = Kv.second.as<sol::table>())
 				{
-					Value.push_back(Kv.second.as<std::string>());
-				}
-			}
-		}
-
-	private:
-		std::vector<std::string>& Value;
-	};
+					std::string Name	 = OpenIdProvider.value().get_or("name", std::string("Default"));
+					std::string Url		 = OpenIdProvider.value().get_or("url", std::string());
+					std::string ClientId = OpenIdProvider.value().get_or("clientid", std::string());
 
-	class ZenAuthConfigOption : public OptionValue
-	{
-	public:
-		ZenAuthConfigOption(ZenAuthConfig& Value) : Value(Value) {}
-		virtual void Print(std::string_view Indent, zen::StringBuilderBase& StringBuilder) override
-		{
-			if (Value.OpenIdProviders.empty())
-			{
-				StringBuilder.Append("{}");
-				return;
-			}
-			LuaContainerWriter Writer(StringBuilder, Indent);
-			for (const ZenOpenIdProviderConfig& Config : Value.OpenIdProviders)
-			{
-				Writer.BeginContainer("");
-				{
-					Writer.WriteValue("name", Config.Name);
-					Writer.WriteValue("url", Config.Url);
-					Writer.WriteValue("clientid", Config.ClientId);
-				}
-				Writer.EndContainer();
-			}
-		}
-		virtual void Parse(sol::object Object) override
-		{
-			if (sol::optional<sol::table> OpenIdProviders = Object.as<sol::table>())
-			{
-				for (const auto& Kv : OpenIdProviders.value())
-				{
-					if (sol::optional<sol::table> OpenIdProvider = Kv.second.as<sol::table>())
-					{
-						std::string Name	 = OpenIdProvider.value().get_or("name", std::string("Default"));
-						std::string Url		 = OpenIdProvider.value().get_or("url", std::string());
-						std::string ClientId = OpenIdProvider.value().get_or("clientid", std::string());
-
-						Value.OpenIdProviders.push_back({.Name = std::move(Name), .Url = std::move(Url), .ClientId = std::move(ClientId)});
-					}
+					Value.OpenIdProviders.push_back({.Name = std::move(Name), .Url = std::move(Url), .ClientId = std::move(ClientId)});
 				}
 			}
 		}
-		ZenAuthConfig& Value;
-	};
+	}
+	ZenAuthConfig& Value;
+};
 
-	class ZenObjectStoreConfigOption : public OptionValue
+class ZenObjectStoreConfigOption : public LuaConfig::OptionValue
+{
+public:
+	ZenObjectStoreConfigOption(ZenObjectStoreConfig& Value) : Value(Value) {}
+	virtual void Print(std::string_view Indent, zen::StringBuilderBase& StringBuilder) override
 	{
-	public:
-		ZenObjectStoreConfigOption(ZenObjectStoreConfig& Value) : Value(Value) {}
-		virtual void Print(std::string_view Indent, zen::StringBuilderBase& StringBuilder) override
+		if (Value.Buckets.empty())
 		{
-			if (Value.Buckets.empty())
-			{
-				StringBuilder.Append("{}");
-				return;
-			}
-			LuaContainerWriter Writer(StringBuilder, Indent);
-			for (const ZenObjectStoreConfig::BucketConfig& Config : Value.Buckets)
-			{
-				Writer.BeginContainer("");
-				{
-					Writer.WriteValue("name", Config.Name);
-					std::string Directory = Config.Directory.string();
-					EscapeBackslash(Directory);
-					Writer.WriteValue("directory", Directory);
-				}
-				Writer.EndContainer();
-			}
+			StringBuilder.Append("{}");
+			return;
 		}
-		virtual void Parse(sol::object Object) override
+		LuaConfig::LuaContainerWriter Writer(StringBuilder, Indent);
+		for (const ZenObjectStoreConfig::BucketConfig& Config : Value.Buckets)
 		{
-			if (sol::optional<sol::table> Buckets = Object.as<sol::table>())
+			Writer.BeginContainer("");
 			{
-				for (const auto& Kv : Buckets.value())
-				{
-					if (sol::optional<sol::table> Bucket = Kv.second.as<sol::table>())
-					{
-						std::string Name	  = Bucket.value().get_or("name", std::string("Default"));
-						std::string Directory = Bucket.value().get_or("directory", std::string());
-
-						Value.Buckets.push_back({.Name = std::move(Name), .Directory = MakeSafePath(Directory)});
-					}
-				}
+				Writer.WriteValue("name", Config.Name);
+				std::string Directory = Config.Directory.string();
+				LuaConfig::EscapeBackslash(Directory);
+				Writer.WriteValue("directory", Directory);
 			}
+			Writer.EndContainer();
 		}
-		ZenObjectStoreConfig& Value;
-	};
-
-	std::shared_ptr<OptionValue> MakeOption(std::string& Value) { return std::make_shared<StringOption>(Value); };
-
-	std::shared_ptr<OptionValue> MakeOption(std::filesystem::path& Value) { return std::make_shared<FilePathOption>(Value); };
-
-	template<Integral T>
-	std::shared_ptr<OptionValue> MakeOption(T& Value)
-	{
-		return std::make_shared<NumberOption<T>>(Value);
-	};
-
-	std::shared_ptr<OptionValue> MakeOption(bool& Value) { return std::make_shared<BoolOption>(Value); };
-
-	std::shared_ptr<OptionValue> MakeOption(UpstreamCachePolicy& Value) { return std::make_shared<CachePolicyOption>(Value); };
-
-	std::shared_ptr<OptionValue> MakeOption(std::vector<std::string>& Value) { return std::make_shared<StringArrayOption>(Value); };
-
-	std::shared_ptr<OptionValue> MakeOption(ZenAuthConfig& Value) { return std::make_shared<ZenAuthConfigOption>(Value); };
-
-	std::shared_ptr<OptionValue> MakeOption(ZenObjectStoreConfig& Value) { return std::make_shared<ZenObjectStoreConfigOption>(Value); };
-
-	struct Option
-	{
-		std::string	 CommandLineOptionName;
-		TOptionValue Value;
-	};
-
-	struct Options
+	}
+	virtual void Parse(sol::object Object) override
 	{
-	public:
-		template<typename T>
-		void AddOption(std::string_view Key, T& Value, std::string_view CommandLineOptionName = "")
-		{
-			OptionMap.insert_or_assign(std::string(Key),
-									   Option{.CommandLineOptionName = std::string(CommandLineOptionName), .Value = MakeOption(Value)});
-		};
-
-		void Parse(const std::filesystem::path& Path, const cxxopts::ParseResult& CmdLineResult)
-		{
-			zen::IoBuffer LuaScript = zen::IoBufferBuilder::MakeFromFile(Path);
-
-			if (LuaScript)
-			{
-				sol::state lua;
-
-				lua.open_libraries(sol::lib::base);
-
-				lua.set_function("getenv", [&](const std::string env) -> sol::object {
-#if ZEN_PLATFORM_WINDOWS
-					std::wstring EnvVarValue;
-					size_t		 RequiredSize = 0;
-					std::wstring EnvWide	  = zen::Utf8ToWide(env);
-					_wgetenv_s(&RequiredSize, nullptr, 0, EnvWide.c_str());
-
-					if (RequiredSize == 0)
-						return sol::make_object(lua, sol::lua_nil);
-
-					EnvVarValue.resize(RequiredSize);
-					_wgetenv_s(&RequiredSize, EnvVarValue.data(), RequiredSize, EnvWide.c_str());
-					return sol::make_object(lua, zen::WideToUtf8(EnvVarValue.c_str()));
-#elif ZEN_PLATFORM_LINUX || ZEN_PLATFORM_MAC
-			char* EnvVariable = getenv(env.c_str());
-			if (EnvVariable == nullptr)
-			{
-				return sol::make_object(lua, sol::lua_nil);
-			}
-			return sol::make_object(lua, EnvVariable);
-#else
-			ZEN_UNUSED(env);
-			return sol::make_object(lua, sol::lua_nil);
-#endif
-				});
-
-				try
-				{
-					sol::load_result config = lua.load(std::string_view((const char*)LuaScript.Data(), LuaScript.Size()), "zen_cfg");
-
-					if (!config.valid())
-					{
-						sol::error err = config;
-
-						std::string ErrorString = sol::to_string(config.status());
-
-						throw std::runtime_error(fmt::format("{} error: {}", ErrorString, err.what()));
-					}
-
-					config();
-				}
-				catch (std::exception& e)
-				{
-					throw std::runtime_error(fmt::format("failed to load config script ('{}'): {}", Path, e.what()).c_str());
-				}
-
-				Parse(lua, CmdLineResult);
-			}
-		}
-
-		void Parse(const sol::state& LuaState, const cxxopts::ParseResult& CmdLineResult)
-		{
-			for (auto It : LuaState)
-			{
-				sol::object Key		= It.first;
-				sol::type	KeyType = Key.get_type();
-				if (KeyType == sol::type::string)
-				{
-					sol::type ValueType = It.second.get_type();
-					switch (ValueType)
-					{
-						case sol::type::table:
-							{
-								std::string Name = Key.as<std::string>();
-								if (Name.starts_with("_"))
-								{
-									continue;
-								}
-								if (Name == "base")
-								{
-									continue;
-								}
-								Traverse(It.second.as<sol::table>(), Name, CmdLineResult);
-							}
-							break;
-						default:
-							break;
-					}
-				}
-			}
-		}
-
-		void Touch(std::string_view Key) { UsedKeys.insert(std::string(Key)); }
-
-		void Print(zen::StringBuilderBase& SB, const cxxopts::ParseResult& CmdLineResult)
+		if (sol::optional<sol::table> Buckets = Object.as<sol::table>())
 		{
-			for (auto It : OptionMap)
+			for (const auto& Kv : Buckets.value())
 			{
-				if (CmdLineResult.count(It.second.CommandLineOptionName) != 0)
+				if (sol::optional<sol::table> Bucket = Kv.second.as<sol::table>())
 				{
-					UsedKeys.insert(It.first);
-				}
-			}
+					std::string Name	  = Bucket.value().get_or("name", std::string("Default"));
+					std::string Directory = Bucket.value().get_or("directory", std::string());
 
-			std::vector<std::string> SortedKeys(UsedKeys.begin(), UsedKeys.end());
-			std::sort(SortedKeys.begin(), SortedKeys.end());
-			auto GetTablePath = [](const std::string& Key) -> std::vector<std::string> {
-				std::vector<std::string> Path;
-				zen::ForEachStrTok(Key, '.', [&Path](std::string_view Part) {
-					Path.push_back(std::string(Part));
-					return true;
-				});
-				return Path;
-			};
-			std::vector<std::string> CurrentTablePath;
-			std::string				 Indent;
-			auto					 It = SortedKeys.begin();
-			for (const std::string& Key : SortedKeys)
-			{
-				std::vector<std::string> KeyPath = GetTablePath(Key);
-				std::string				 Name	 = KeyPath.back();
-				KeyPath.pop_back();
-				if (CurrentTablePath != KeyPath)
-				{
-					size_t EqualCount = 0;
-					while (EqualCount < CurrentTablePath.size() && EqualCount < KeyPath.size() &&
-						   CurrentTablePath[EqualCount] == KeyPath[EqualCount])
-					{
-						EqualCount++;
-					}
-					while (CurrentTablePath.size() > EqualCount)
-					{
-						CurrentTablePath.pop_back();
-						Indent.pop_back();
-						SB.Append(Indent);
-						SB.Append("}");
-						if (CurrentTablePath.size() == EqualCount && !Indent.empty() && KeyPath.size() >= EqualCount)
-						{
-							SB.Append(",");
-						}
-						SB.Append("\n");
-						if (Indent.empty())
-						{
-							SB.Append("\n");
-						}
-					}
-					while (EqualCount < KeyPath.size())
-					{
-						SB.Append(Indent);
-						SB.Append(KeyPath[EqualCount]);
-						SB.Append(" = {\n");
-						Indent.push_back('\t');
-						CurrentTablePath.push_back(KeyPath[EqualCount]);
-						EqualCount++;
-					}
+					Value.Buckets.push_back({.Name = std::move(Name), .Directory = LuaConfig::MakeSafePath(Directory)});
 				}
-
-				SB.Append(Indent);
-				SB.Append(Name);
-				SB.Append(" = ");
-				OptionMap[Key].Value->Print(Indent, SB);
-				SB.Append(",\n");
-			}
-			while (!CurrentTablePath.empty())
-			{
-				Indent.pop_back();
-				SB.Append(Indent);
-				SB.Append("}\n");
-				CurrentTablePath.pop_back();
 			}
 		}
+	}
+	ZenObjectStoreConfig& Value;
+};
 
-	private:
-		void Traverse(sol::table Table, std::string_view PathPrefix, const cxxopts::ParseResult& CmdLineResult)
-		{
-			for (auto It : Table)
-			{
-				sol::object Key		= It.first;
-				sol::type	KeyType = Key.get_type();
-				if (KeyType == sol::type::string || KeyType == sol::type::number)
-				{
-					sol::type ValueType = It.second.get_type();
-					switch (ValueType)
-					{
-						case sol::type::table:
-						case sol::type::string:
-						case sol::type::number:
-						case sol::type::boolean:
-							{
-								std::string Name = Key.as<std::string>();
-								if (Name.starts_with("_"))
-								{
-									continue;
-								}
-								Name		  = std::string(PathPrefix) + "." + Key.as<std::string>();
-								auto OptionIt = OptionMap.find(Name);
-								if (OptionIt != OptionMap.end())
-								{
-									UsedKeys.insert(Name);
-									if (CmdLineResult.count(OptionIt->second.CommandLineOptionName) != 0)
-									{
-										continue;
-									}
-									OptionIt->second.Value->Parse(It.second);
-									continue;
-								}
-								if (ValueType == sol::type::table)
-								{
-									if (Name == "base")
-									{
-										continue;
-									}
-									Traverse(It.second.as<sol::table>(), Name, CmdLineResult);
-								}
-							}
-							break;
-						default:
-							break;
-					}
-				}
-			}
-		}
+std::shared_ptr<LuaConfig::OptionValue>
+MakeOption(zen::UpstreamCachePolicy& Value)
+{
+	return std::make_shared<CachePolicyOption>(Value);
+};
 
-		std::unordered_map<std::string, Option> OptionMap;
-		std::unordered_set<std::string>			UsedKeys;
-	};
+std::shared_ptr<LuaConfig::OptionValue>
+MakeOption(zen::ZenAuthConfig& Value)
+{
+	return std::make_shared<ZenAuthConfigOption>(Value);
+};
 
-}  // namespace LuaConfig
+std::shared_ptr<LuaConfig::OptionValue>
+MakeOption(zen::ZenObjectStoreConfig& Value)
+{
+	return std::make_shared<ZenObjectStoreConfigOption>(Value);
+};
 
 void
 ParseConfigFile(const std::filesystem::path& Path,
@@ -887,6 +453,10 @@ ParseConfigFile(const std::filesystem::path& Path,
 	LuaOptions.AddOption("gc.lightweightntervalseconds"sv,
 						 ServerOptions.GcConfig.LightweightIntervalSeconds,
 						 "gc-lightweight-interval-seconds"sv);
+	LuaOptions.AddOption("gc.compactblockthreshold"sv,
+						 ServerOptions.GcConfig.CompactBlockUsageThresholdPercent,
+						 "gc-compactblock-threshold"sv);
+	LuaOptions.AddOption("gc.verbose"sv, ServerOptions.GcConfig.Verbose, "gc-verbose"sv);
 
 	////// gc
 	LuaOptions.AddOption("gc.cache.maxdurationseconds"sv, ServerOptions.GcConfig.Cache.MaxDurationSeconds, "gc-cache-duration-seconds"sv);
@@ -938,6 +508,7 @@ ParseCliOptions(int argc, char* argv[], ZenServerOptions& ServerOptions)
 	std::string AbsLogFile;
 	std::string ConfigFile;
 	std::string OutputConfigFile;
+	std::string BaseSnapshotDir;
 
 	cxxopts::Options options("zenserver", "Zen Server");
 	options.add_options()("dedicated",
@@ -947,12 +518,20 @@ ParseCliOptions(int argc, char* argv[], ZenServerOptions& ServerOptions)
 	options.add_options()("clean",
 						  "Clean out all state at startup",
 						  cxxopts::value<bool>(ServerOptions.IsCleanStart)->default_value("false"));
+	options.add_options()("scrub",
+						  "Validate state at startup",
+						  cxxopts::value(ServerOptions.ScrubOptions)->implicit_value("yes"),
+						  "(nocas,nogc,nodelete,yes,no)*");
 	options.add_options()("help", "Show command line help");
 	options.add_options()("t, test", "Enable test mode", cxxopts::value<bool>(ServerOptions.IsTest)->default_value("false"));
-	options.add_options()("log-id", "Specify id for adding context to log output", cxxopts::value<std::string>(ServerOptions.LogId));
 	options.add_options()("data-dir", "Specify persistence root", cxxopts::value<std::string>(DataDir));
+	options.add_options()("snapshot-dir",
+						  "Specify a snapshot of server state to mirror into the persistence root at startup",
+						  cxxopts::value<std::string>(BaseSnapshotDir));
 	options.add_options()("content-dir", "Frontend content directory", cxxopts::value<std::string>(ContentDir));
-	options.add_options()("abslog", "Path to log file", cxxopts::value<std::string>(AbsLogFile));
+	options.add_options()("powercycle",
+						  "Exit immediately after initialization is complete",
+						  cxxopts::value<bool>(ServerOptions.IsPowerCycle));
 	options.add_options()("config", "Path to Lua config file", cxxopts::value<std::string>(ConfigFile));
 	options.add_options()("write-config", "Path to output Lua config file", cxxopts::value<std::string>(OutputConfigFile));
 	options.add_options()("no-sentry",
@@ -961,7 +540,21 @@ ParseCliOptions(int argc, char* argv[], ZenServerOptions& ServerOptions)
 	options.add_options()("sentry-allow-personal-info",
 						  "Allow personally identifiable information in sentry crash reports",
 						  cxxopts::value<bool>(ServerOptions.SentryAllowPII)->default_value("false"));
-	options.add_options()("quiet", "Disable console logging", cxxopts::value<bool>(ServerOptions.NoConsoleOutput)->default_value("false"));
+
+	// clang-format off
+	options.add_options("logging")
+		("abslog",			"Path to log file",								cxxopts::value<std::string>(AbsLogFile))
+		("log-id",			"Specify id for adding context to log output",	cxxopts::value<std::string>(ServerOptions.LogId))
+		("quiet", 			"Disable console logging", 						cxxopts::value<bool>(ServerOptions.NoConsoleOutput)->default_value("false"))
+		("log-trace", 		"Change selected loggers to level TRACE", 		cxxopts::value<std::string>(ServerOptions.Loggers[logging::level::Trace]))
+		("log-debug", 		"Change selected loggers to level DEBUG", 		cxxopts::value<std::string>(ServerOptions.Loggers[logging::level::Debug]))
+		("log-info", 		"Change selected loggers to level INFO", 		cxxopts::value<std::string>(ServerOptions.Loggers[logging::level::Info]))
+		("log-warn", 		"Change selected loggers to level WARN", 		cxxopts::value<std::string>(ServerOptions.Loggers[logging::level::Warn]))
+		("log-error", 		"Change selected loggers to level ERROR", 		cxxopts::value<std::string>(ServerOptions.Loggers[logging::level::Err]))
+		("log-critical", 	"Change selected loggers to level CRITICAL", 	cxxopts::value<std::string>(ServerOptions.Loggers[logging::level::Critical]))
+		("log-off", 		"Change selected loggers to level OFF", 		cxxopts::value<std::string>(ServerOptions.Loggers[logging::level::Off]))
+	;
+	// clang-format on
 
 	options.add_option("security",
 					   "",
@@ -1313,6 +906,21 @@ ParseCliOptions(int argc, char* argv[], ZenServerOptions& ServerOptions)
 					   cxxopts::value<uint64_t>(ServerOptions.GcConfig.DiskSizeSoftLimit)->default_value("0"),
 					   "");
 
+	options.add_option("gc",
+					   "",
+					   "gc-compactblock-threshold",
+					   "Garbage collection - how much of a compact block should be used to skip compacting the block. 0 - compact only "
+					   "empty eligible blocks, 100 - compact all non-full eligible blocks.",
+					   cxxopts::value<uint32_t>(ServerOptions.GcConfig.CompactBlockUsageThresholdPercent)->default_value("60"),
+					   "");
+
+	options.add_option("gc",
+					   "",
+					   "gc-verbose",
+					   "Enable verbose logging for GC.",
+					   cxxopts::value<bool>(ServerOptions.GcConfig.Verbose)->default_value("false"),
+					   "");
+
 	options.add_option("objectstore",
 					   "",
 					   "objectstore-enabled",
@@ -1337,9 +945,18 @@ ParseCliOptions(int argc, char* argv[], ZenServerOptions& ServerOptions)
 
 	try
 	{
-		auto result = options.parse(argc, argv);
+		cxxopts::ParseResult Result;
 
-		if (result.count("help"))
+		try
+		{
+			Result = options.parse(argc, argv);
+		}
+		catch (std::exception& Ex)
+		{
+			throw zen::OptionParseException(Ex.what());
+		}
+
+		if (Result.count("help"))
 		{
 			ZEN_CONSOLE("{}", options.help());
 #if ZEN_PLATFORM_WINDOWS
@@ -1352,12 +969,28 @@ ParseCliOptions(int argc, char* argv[], ZenServerOptions& ServerOptions)
 			exit(0);
 		}
 
+		for (int i = 0; i < logging::level::LogLevelCount; ++i)
+		{
+			logging::ConfigureLogLevels(logging::level::LogLevel(i), ServerOptions.Loggers[i]);
+		}
+		logging::RefreshLogLevels();
+
 		ServerOptions.DataDir						  = MakeSafePath(DataDir);
+		ServerOptions.BaseSnapshotDir				  = MakeSafePath(BaseSnapshotDir);
 		ServerOptions.ContentDir					  = MakeSafePath(ContentDir);
 		ServerOptions.AbsLogFile					  = MakeSafePath(AbsLogFile);
 		ServerOptions.ConfigFile					  = MakeSafePath(ConfigFile);
 		ServerOptions.UpstreamCacheConfig.CachePolicy = ParseUpstreamCachePolicy(UpstreamCachePolicyOptions);
 
+		if (!BaseSnapshotDir.empty())
+		{
+			if (DataDir.empty())
+				throw zen::OptionParseException("You must explicitly specify a data directory when specifying a base snapshot");
+
+			if (!std::filesystem::is_directory(ServerOptions.BaseSnapshotDir))
+				throw OptionParseException(fmt::format("Snapshot directory must be a directory: '{}", BaseSnapshotDir));
+		}
+
 		if (OpenIdProviderUrl.empty() == false)
 		{
 			if (OpenIdClientId.empty())
@@ -1373,21 +1006,15 @@ ParseCliOptions(int argc, char* argv[], ZenServerOptions& ServerOptions)
 
 		if (!ServerOptions.ConfigFile.empty())
 		{
-			ParseConfigFile(ServerOptions.ConfigFile, ServerOptions, result, OutputConfigFile);
+			ParseConfigFile(ServerOptions.ConfigFile, ServerOptions, Result, OutputConfigFile);
 		}
 		else
 		{
-			ParseConfigFile(ServerOptions.DataDir / "zen_cfg.lua", ServerOptions, result, OutputConfigFile);
+			ParseConfigFile(ServerOptions.DataDir / "zen_cfg.lua", ServerOptions, Result, OutputConfigFile);
 		}
 
 		ValidateOptions(ServerOptions);
 	}
-	catch (cxxopts::OptionParseException& e)
-	{
-		ZEN_CONSOLE_ERROR("Error parsing zenserver arguments: {}\n\n{}", e.what(), options.help());
-
-		throw;
-	}
 	catch (zen::OptionParseException& e)
 	{
 		ZEN_CONSOLE_ERROR("Error parsing zenserver arguments: {}\n\n{}", e.what(), options.help());
diff --git a/src/zenserver/config.h b/src/zenserver/config.h
index d55f0d5a1..cd2d92523 100644
--- a/src/zenserver/config.h
+++ b/src/zenserver/config.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include <zencore/logbase.h>
 #include <zencore/zencore.h>
 #include <zenhttp/httpserver.h>
 #include <filesystem>
@@ -72,6 +73,8 @@ struct ZenGcConfig
 	int32_t						  LightweightIntervalSeconds		= 0;
 	uint64_t					  MinimumFreeDiskSpaceToAllowWrites = 1ul << 28;
 	bool						  UseGCV2							= false;
+	uint32_t					  CompactBlockUsageThresholdPercent = 90;
+	bool						  Verbose							= false;
 };
 
 struct ZenOpenIdProviderConfig
@@ -129,6 +132,7 @@ struct ZenServerOptions
 	std::filesystem::path	 ContentDir;				  // Root directory for serving frontend content (experimental)
 	std::filesystem::path	 AbsLogFile;				  // Absolute path to main log file
 	std::filesystem::path	 ConfigFile;				  // Path to Lua config file
+	std::filesystem::path	 BaseSnapshotDir;			  // Path to server state snapshot (will be copied into data dir on start)
 	std::string				 ChildId;					  // Id assigned by parent process (used for lifetime management)
 	std::string				 LogId;						  // Id for tagging log output
 	std::string				 EncryptionKey;				  // 256 bit AES encryption key
@@ -139,6 +143,7 @@ struct ZenServerOptions
 	bool					 UninstallService	= false;  // Flag used to initiate service uninstall (temporary)
 	bool					 IsDebug			= false;
 	bool					 IsCleanStart		= false;  // Indicates whether all state should be wiped on startup or not
+	bool					 IsPowerCycle		= false;  // When true, the process shuts down immediately after initialization
 	bool					 IsTest				= false;
 	bool					 IsDedicated		= false;  // Indicates a dedicated/shared instance, with larger resource requirements
 	bool					 ShouldCrash		= false;  // Option for testing crash handling
@@ -147,6 +152,8 @@ struct ZenServerOptions
 	bool					 SentryAllowPII		= false;  // Allow personally identifiable information in sentry crash reports
 	bool					 ObjectStoreEnabled = false;
 	bool					 NoConsoleOutput	= false;  // Control default use of stdout for diagnostics
+	std::string				 Loggers[zen::logging::level::LogLevelCount];
+	std::string				 ScrubOptions;
 #if ZEN_WITH_TRACE
 	std::string TraceHost;	// Host name or IP address to send trace data to
 	std::string TraceFile;	// Path of a file to write a trace
diff --git a/src/zenserver/config/luaconfig.cpp b/src/zenserver/config/luaconfig.cpp
new file mode 100644
index 000000000..cdc808cf6
--- /dev/null
+++ b/src/zenserver/config/luaconfig.cpp
@@ -0,0 +1,461 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "luaconfig.h"
+
+namespace zen::LuaConfig {
+
+std::string
+MakeSafePath(const std::string_view Path)
+{
+#if ZEN_PLATFORM_WINDOWS
+	if (Path.empty())
+	{
+		return std::string(Path);
+	}
+
+	std::string FixedPath(Path);
+	std::replace(FixedPath.begin(), FixedPath.end(), '/', '\\');
+	if (!FixedPath.starts_with("\\\\?\\"))
+	{
+		FixedPath.insert(0, "\\\\?\\");
+	}
+	return FixedPath;
+#else
+	return std::string(Path);
+#endif
+};
+
+void
+EscapeBackslash(std::string& InOutString)
+{
+	std::size_t BackslashPos = InOutString.find('\\');
+	if (BackslashPos != std::string::npos)
+	{
+		std::size_t						  Offset = 0;
+		zen::ExtendableStringBuilder<512> PathBuilder;
+		while (BackslashPos != std::string::npos)
+		{
+			PathBuilder.Append(InOutString.substr(Offset, BackslashPos + 1 - Offset));
+			PathBuilder.Append('\\');
+			Offset		 = BackslashPos + 1;
+			BackslashPos = InOutString.find('\\', Offset);
+		}
+		PathBuilder.Append(InOutString.substr(Offset, BackslashPos));
+		InOutString = PathBuilder.ToString();
+	}
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+BoolOption::BoolOption(bool& Value) : Value(Value)
+{
+}
+
+void
+BoolOption::Print(std::string_view, zen::StringBuilderBase& StringBuilder)
+{
+	StringBuilder.Append(Value ? "true" : "false");
+}
+
+void
+BoolOption::Parse(sol::object Object)
+{
+	Value = Object.as<bool>();
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+StringOption::StringOption(std::string& Value) : Value(Value)
+{
+}
+
+void
+StringOption::Print(std::string_view, zen::StringBuilderBase& StringBuilder)
+{
+	StringBuilder.Append(fmt::format("\"{}\"", Value));
+}
+
+void
+StringOption::Parse(sol::object Object)
+{
+	Value = Object.as<std::string>();
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+FilePathOption::FilePathOption(std::filesystem::path& Value) : Value(Value)
+{
+}
+
+void
+FilePathOption::Print(std::string_view, zen::StringBuilderBase& StringBuilder)
+{
+	std::string Path = Value.string();
+	EscapeBackslash(Path);
+	StringBuilder.Append(fmt::format("\"{}\"", Path));
+}
+
+void
+FilePathOption::Parse(sol::object Object)
+{
+	std::string Str = Object.as<std::string>();
+	if (!Str.empty())
+	{
+		Value = MakeSafePath(Str);
+	}
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+LuaContainerWriter::LuaContainerWriter(zen::StringBuilderBase& StringBuilder, std::string_view Indent)
+: StringBuilder(StringBuilder)
+, InitialIndent(Indent.length())
+, LocalIndent(Indent)
+{
+	StringBuilder.Append("{\n");
+	LocalIndent.push_back('\t');
+}
+
+LuaContainerWriter::~LuaContainerWriter()
+{
+	LocalIndent.pop_back();
+	StringBuilder.Append(LocalIndent);
+	StringBuilder.Append("}");
+}
+
+void
+LuaContainerWriter::BeginContainer(std::string_view Name)
+{
+	StringBuilder.Append(LocalIndent);
+	if (!Name.empty())
+	{
+		StringBuilder.Append(Name);
+		StringBuilder.Append(" = {\n");
+	}
+	else
+	{
+		StringBuilder.Append("{\n");
+	}
+	LocalIndent.push_back('\t');
+}
+
+void
+LuaContainerWriter::WriteValue(std::string_view Name, std::string_view Value)
+{
+	if (Name.empty())
+	{
+		StringBuilder.Append(fmt::format("{}\"{}\",\n", LocalIndent, Value));
+	}
+	else
+	{
+		StringBuilder.Append(fmt::format("{}{} = \"{}\",\n", LocalIndent, Name, Value));
+	}
+}
+
+void
+LuaContainerWriter::EndContainer()
+{
+	LocalIndent.pop_back();
+	StringBuilder.Append(LocalIndent);
+	StringBuilder.Append("}");
+	StringBuilder.Append(",\n");
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+StringArrayOption::StringArrayOption(std::vector<std::string>& Value) : Value(Value)
+{
+}
+
+void
+StringArrayOption::Print(std::string_view Indent, zen::StringBuilderBase& StringBuilder)
+{
+	if (Value.empty())
+	{
+		StringBuilder.Append("{}");
+	}
+	if (Value.size() == 1)
+	{
+		StringBuilder.Append(fmt::format("\"{}\"", Value[0]));
+	}
+	else
+	{
+		LuaContainerWriter Writer(StringBuilder, Indent);
+		for (std::string String : Value)
+		{
+			Writer.WriteValue("", String);
+		}
+	}
+}
+
+void
+StringArrayOption::Parse(sol::object Object)
+{
+	if (Object.get_type() == sol::type::string)
+	{
+		Value.push_back(Object.as<std::string>());
+	}
+	else if (Object.get_type() == sol::type::table)
+	{
+		for (const auto& Kv : Object.as<sol::table>())
+		{
+			Value.push_back(Kv.second.as<std::string>());
+		}
+	}
+}
+
+std::shared_ptr<OptionValue>
+MakeOption(std::string& Value)
+{
+	return std::make_shared<StringOption>(Value);
+}
+
+std::shared_ptr<OptionValue>
+MakeOption(std::filesystem::path& Value)
+{
+	return std::make_shared<FilePathOption>(Value);
+}
+
+std::shared_ptr<OptionValue>
+MakeOption(bool& Value)
+{
+	return std::make_shared<BoolOption>(Value);
+}
+
+std::shared_ptr<OptionValue>
+MakeOption(std::vector<std::string>& Value)
+{
+	return std::make_shared<StringArrayOption>(Value);
+}
+
+void
+Options::Parse(const std::filesystem::path& Path, const cxxopts::ParseResult& CmdLineResult)
+{
+	zen::IoBuffer LuaScript = zen::IoBufferBuilder::MakeFromFile(Path);
+
+	if (LuaScript)
+	{
+		sol::state lua;
+
+		lua.open_libraries(sol::lib::base);
+
+		lua.set_function("getenv", [&](const std::string env) -> sol::object {
+#if ZEN_PLATFORM_WINDOWS
+			std::wstring EnvVarValue;
+			size_t		 RequiredSize = 0;
+			std::wstring EnvWide	  = zen::Utf8ToWide(env);
+			_wgetenv_s(&RequiredSize, nullptr, 0, EnvWide.c_str());
+
+			if (RequiredSize == 0)
+				return sol::make_object(lua, sol::lua_nil);
+
+			EnvVarValue.resize(RequiredSize);
+			_wgetenv_s(&RequiredSize, EnvVarValue.data(), RequiredSize, EnvWide.c_str());
+			return sol::make_object(lua, zen::WideToUtf8(EnvVarValue.c_str()));
+#elif ZEN_PLATFORM_LINUX || ZEN_PLATFORM_MAC
+			char* EnvVariable = getenv(env.c_str());
+			if (EnvVariable == nullptr)
+			{
+				return sol::make_object(lua, sol::lua_nil);
+			}
+			return sol::make_object(lua, EnvVariable);
+#else
+			ZEN_UNUSED(env);
+			return sol::make_object(lua, sol::lua_nil);
+#endif
+		});
+
+		try
+		{
+			sol::load_result config = lua.load(std::string_view((const char*)LuaScript.Data(), LuaScript.Size()), "zen_cfg");
+
+			if (!config.valid())
+			{
+				sol::error err = config;
+
+				std::string ErrorString = sol::to_string(config.status());
+
+				throw std::runtime_error(fmt::format("{} error: {}", ErrorString, err.what()));
+			}
+
+			config();
+		}
+		catch (std::exception& e)
+		{
+			throw std::runtime_error(fmt::format("failed to load config script ('{}'): {}", Path, e.what()).c_str());
+		}
+
+		Parse(lua, CmdLineResult);
+	}
+}
+
+void
+Options::Parse(const sol::state& LuaState, const cxxopts::ParseResult& CmdLineResult)
+{
+	for (auto It : LuaState)
+	{
+		sol::object Key		= It.first;
+		sol::type	KeyType = Key.get_type();
+		if (KeyType == sol::type::string)
+		{
+			sol::type ValueType = It.second.get_type();
+			switch (ValueType)
+			{
+				case sol::type::table:
+					{
+						std::string Name = Key.as<std::string>();
+						if (Name.starts_with("_"))
+						{
+							continue;
+						}
+						if (Name == "base")
+						{
+							continue;
+						}
+						Traverse(It.second.as<sol::table>(), Name, CmdLineResult);
+					}
+					break;
+				default:
+					break;
+			}
+		}
+	}
+}
+
+void
+Options::Touch(std::string_view Key)
+{
+	UsedKeys.insert(std::string(Key));
+}
+
+void
+Options::Print(zen::StringBuilderBase& SB, const cxxopts::ParseResult& CmdLineResult)
+{
+	for (auto It : OptionMap)
+	{
+		if (CmdLineResult.count(It.second.CommandLineOptionName) != 0)
+		{
+			UsedKeys.insert(It.first);
+		}
+	}
+
+	std::vector<std::string> SortedKeys(UsedKeys.begin(), UsedKeys.end());
+	std::sort(SortedKeys.begin(), SortedKeys.end());
+	auto GetTablePath = [](const std::string& Key) -> std::vector<std::string> {
+		std::vector<std::string> Path;
+		zen::ForEachStrTok(Key, '.', [&Path](std::string_view Part) {
+			Path.push_back(std::string(Part));
+			return true;
+		});
+		return Path;
+	};
+	std::vector<std::string> CurrentTablePath;
+	std::string				 Indent;
+	auto					 It = SortedKeys.begin();
+	for (const std::string& Key : SortedKeys)
+	{
+		std::vector<std::string> KeyPath = GetTablePath(Key);
+		std::string				 Name	 = KeyPath.back();
+		KeyPath.pop_back();
+		if (CurrentTablePath != KeyPath)
+		{
+			size_t EqualCount = 0;
+			while (EqualCount < CurrentTablePath.size() && EqualCount < KeyPath.size() &&
+				   CurrentTablePath[EqualCount] == KeyPath[EqualCount])
+			{
+				EqualCount++;
+			}
+			while (CurrentTablePath.size() > EqualCount)
+			{
+				CurrentTablePath.pop_back();
+				Indent.pop_back();
+				SB.Append(Indent);
+				SB.Append("}");
+				if (CurrentTablePath.size() == EqualCount && !Indent.empty() && KeyPath.size() >= EqualCount)
+				{
+					SB.Append(",");
+				}
+				SB.Append("\n");
+				if (Indent.empty())
+				{
+					SB.Append("\n");
+				}
+			}
+			while (EqualCount < KeyPath.size())
+			{
+				SB.Append(Indent);
+				SB.Append(KeyPath[EqualCount]);
+				SB.Append(" = {\n");
+				Indent.push_back('\t');
+				CurrentTablePath.push_back(KeyPath[EqualCount]);
+				EqualCount++;
+			}
+		}
+
+		SB.Append(Indent);
+		SB.Append(Name);
+		SB.Append(" = ");
+		OptionMap[Key].Value->Print(Indent, SB);
+		SB.Append(",\n");
+	}
+	while (!CurrentTablePath.empty())
+	{
+		Indent.pop_back();
+		SB.Append(Indent);
+		SB.Append("}\n");
+		CurrentTablePath.pop_back();
+	}
+}
+
+void
+Options::Traverse(sol::table Table, std::string_view PathPrefix, const cxxopts::ParseResult& CmdLineResult)
+{
+	for (auto It : Table)
+	{
+		sol::object Key		= It.first;
+		sol::type	KeyType = Key.get_type();
+		if (KeyType == sol::type::string || KeyType == sol::type::number)
+		{
+			sol::type ValueType = It.second.get_type();
+			switch (ValueType)
+			{
+				case sol::type::table:
+				case sol::type::string:
+				case sol::type::number:
+				case sol::type::boolean:
+					{
+						std::string Name = Key.as<std::string>();
+						if (Name.starts_with("_"))
+						{
+							continue;
+						}
+						Name		  = std::string(PathPrefix) + "." + Key.as<std::string>();
+						auto OptionIt = OptionMap.find(Name);
+						if (OptionIt != OptionMap.end())
+						{
+							UsedKeys.insert(Name);
+							if (CmdLineResult.count(OptionIt->second.CommandLineOptionName) != 0)
+							{
+								continue;
+							}
+							OptionIt->second.Value->Parse(It.second);
+							continue;
+						}
+						if (ValueType == sol::type::table)
+						{
+							if (Name == "base")
+							{
+								continue;
+							}
+							Traverse(It.second.as<sol::table>(), Name, CmdLineResult);
+						}
+					}
+					break;
+				default:
+					break;
+			}
+		}
+	}
+}
+
+}  // namespace zen::LuaConfig
diff --git a/src/zenserver/config/luaconfig.h b/src/zenserver/config/luaconfig.h
new file mode 100644
index 000000000..76b3088a3
--- /dev/null
+++ b/src/zenserver/config/luaconfig.h
@@ -0,0 +1,139 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include <zenbase/concepts.h>
+#include <zencore/fmtutils.h>
+
+ZEN_THIRD_PARTY_INCLUDES_START
+#include <fmt/format.h>
+#include <cxxopts.hpp>
+#include <sol/sol.hpp>
+ZEN_THIRD_PARTY_INCLUDES_END
+
+#include <filesystem>
+#include <memory>
+#include <string>
+#include <string_view>
+#include <unordered_map>
+#include <unordered_set>
+
+namespace zen::LuaConfig {
+
+std::string MakeSafePath(const std::string_view Path);
+void		EscapeBackslash(std::string& InOutString);
+
+class OptionValue
+{
+public:
+	virtual void Print(std::string_view Indent, zen::StringBuilderBase& StringBuilder) = 0;
+	virtual void Parse(sol::object Object)											   = 0;
+
+	virtual ~OptionValue() {}
+};
+
+class StringOption : public OptionValue
+{
+public:
+	explicit StringOption(std::string& Value);
+	virtual void Print(std::string_view, zen::StringBuilderBase& StringBuilder) override;
+	virtual void Parse(sol::object Object) override;
+	std::string& Value;
+};
+
+class FilePathOption : public OptionValue
+{
+public:
+	explicit FilePathOption(std::filesystem::path& Value);
+	virtual void		   Print(std::string_view, zen::StringBuilderBase& StringBuilder) override;
+	virtual void		   Parse(sol::object Object) override;
+	std::filesystem::path& Value;
+};
+
+class BoolOption : public OptionValue
+{
+public:
+	explicit BoolOption(bool& Value);
+	virtual void Print(std::string_view, zen::StringBuilderBase& StringBuilder);
+	virtual void Parse(sol::object Object);
+	bool&		 Value;
+};
+
+template<Integral T>
+class NumberOption : public OptionValue
+{
+public:
+	explicit NumberOption(T& Value) : Value(Value) {}
+	virtual void Print(std::string_view, zen::StringBuilderBase& StringBuilder) override { StringBuilder.Append(fmt::format("{}", Value)); }
+	virtual void Parse(sol::object Object) override { Value = Object.as<T>(); }
+	T&			 Value;
+};
+
+class LuaContainerWriter
+{
+public:
+	LuaContainerWriter(zen::StringBuilderBase& StringBuilder, std::string_view Indent);
+	~LuaContainerWriter();
+	void BeginContainer(std::string_view Name);
+	void WriteValue(std::string_view Name, std::string_view Value);
+	void EndContainer();
+
+private:
+	zen::StringBuilderBase& StringBuilder;
+	const std::size_t		InitialIndent;
+	std::string				LocalIndent;
+};
+
+class StringArrayOption : public OptionValue
+{
+public:
+	explicit StringArrayOption(std::vector<std::string>& Value);
+	virtual void Print(std::string_view Indent, zen::StringBuilderBase& StringBuilder) override;
+	virtual void Parse(sol::object Object) override;
+
+private:
+	std::vector<std::string>& Value;
+};
+
+std::shared_ptr<OptionValue> MakeOption(std::string& Value);
+std::shared_ptr<OptionValue> MakeOption(std::filesystem::path& Value);
+
+template<Integral T>
+std::shared_ptr<OptionValue>
+MakeOption(T& Value)
+{
+	return std::make_shared<NumberOption<T>>(Value);
+};
+
+std::shared_ptr<OptionValue> MakeOption(bool& Value);
+std::shared_ptr<OptionValue> MakeOption(std::vector<std::string>& Value);
+
+struct Option
+{
+	std::string					 CommandLineOptionName;
+	std::shared_ptr<OptionValue> Value;
+};
+
+struct Options
+{
+public:
+	template<typename T>
+	void AddOption(std::string_view Key, T& Value, std::string_view CommandLineOptionName = "")
+	{
+		OptionMap.insert_or_assign(std::string(Key),
+								   Option{.CommandLineOptionName = std::string(CommandLineOptionName), .Value = MakeOption(Value)});
+	};
+
+	void Parse(const std::filesystem::path& Path, const cxxopts::ParseResult& CmdLineResult);
+	void Parse(const sol::state& LuaState, const cxxopts::ParseResult& CmdLineResult);
+	void Touch(std::string_view Key);
+	void Print(zen::StringBuilderBase& SB, const cxxopts::ParseResult& CmdLineResult);
+
+private:
+	void Traverse(sol::table Table, std::string_view PathPrefix, const cxxopts::ParseResult& CmdLineResult);
+
+	std::unordered_map<std::string, Option> OptionMap;
+	std::unordered_set<std::string>			UsedKeys;
+};
+
+}  // namespace zen::LuaConfig
diff --git a/src/zenserver/diag/logging.cpp b/src/zenserver/diag/logging.cpp
index e2d57b840..dc1675819 100644
--- a/src/zenserver/diag/logging.cpp
+++ b/src/zenserver/diag/logging.cpp
@@ -42,6 +42,7 @@ InitializeServerLogging(const ZenServerOptions& InOptions)
 																	   /* max files */ 16,
 																	   /* rotate on open */ true);
 	auto HttpLogger = std::make_shared<spdlog::logger>("http_requests", HttpSink);
+	spdlog::apply_logger_env_levels(HttpLogger);
 	spdlog::register_logger(HttpLogger);
 
 	// Cache request logging
@@ -53,16 +54,19 @@ InitializeServerLogging(const ZenServerOptions& InOptions)
 																		/* max files */ 16,
 																		/* rotate on open */ false);
 	auto CacheLogger = std::make_shared<spdlog::logger>("z$", CacheSink);
+	spdlog::apply_logger_env_levels(CacheLogger);
 	spdlog::register_logger(CacheLogger);
 
 	// Jupiter - only log upstream HTTP traffic to file
 
 	auto JupiterLogger = std::make_shared<spdlog::logger>("jupiter", FileSink);
+	spdlog::apply_logger_env_levels(JupiterLogger);
 	spdlog::register_logger(JupiterLogger);
 
 	// Zen - only log upstream HTTP traffic to file
 
 	auto ZenClientLogger = std::make_shared<spdlog::logger>("zenclient", FileSink);
+	spdlog::apply_logger_env_levels(ZenClientLogger);
 	spdlog::register_logger(ZenClientLogger);
 
 	FinishInitializeLogging(LogOptions);
diff --git a/src/zenserver/frontend/frontend.cpp b/src/zenserver/frontend/frontend.cpp
index 8c8e5cb9c..9bc408711 100644
--- a/src/zenserver/frontend/frontend.cpp
+++ b/src/zenserver/frontend/frontend.cpp
@@ -14,6 +14,9 @@ ZEN_THIRD_PARTY_INCLUDES_START
 #endif
 ZEN_THIRD_PARTY_INCLUDES_END
 
+static unsigned char gHtmlZipData[] = {
+#include <html.zip.h>
+};
 namespace zen {
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -22,8 +25,8 @@ HttpFrontendService::HttpFrontendService(std::filesystem::path Directory) : m_Di
 	std::filesystem::path SelfPath = GetRunningExecutablePath();
 
 	// Locate a .zip file appended onto the end of this binary
-	IoBuffer SelfBuffer = IoBufferBuilder::MakeFromFile(SelfPath);
-	m_ZipFs				= ZipFs(std::move(SelfBuffer));
+	IoBuffer HtmlZipDataBuffer(IoBuffer::Wrap, gHtmlZipData, sizeof(gHtmlZipData) - 1);
+	m_ZipFs = ZipFs(std::move(HtmlZipDataBuffer));
 
 	if (m_Directory.empty() && !m_ZipFs)
 	{
diff --git a/src/zenserver/frontend/html.zip b/src/zenserver/frontend/html.zip
new file mode 100644
index 000000000..fa2f2febf
--- /dev/null
+++ b/src/zenserver/frontend/html.zip
diff --git a/src/zenserver/main.cpp b/src/zenserver/main.cpp
index 69cc2bbf5..be2cdcc2d 100644
--- a/src/zenserver/main.cpp
+++ b/src/zenserver/main.cpp
@@ -39,6 +39,7 @@ ZEN_THIRD_PARTY_INCLUDES_END
 #if ZEN_WITH_TESTS
 #	define ZEN_TEST_WITH_RUNNER 1
 #	include <zencore/testing.h>
+#	include <zenutil/zenutil.h>
 #endif
 
 #include <memory>
@@ -198,13 +199,15 @@ ZenEntryPoint::Run()
 		ShutdownThread.reset(new std::thread{[&] {
 			SetCurrentThreadName("shutdown_monitor");
 
-			ZEN_INFO("shutdown monitor thread waiting for shutdown signal '{}'", ShutdownEventName);
+			ZEN_INFO("shutdown monitor thread waiting for shutdown signal '{}' for process {}",
+					 ShutdownEventName,
+					 zen::GetCurrentProcessId());
 
 			if (ShutdownEvent->Wait())
 			{
 				if (!IsApplicationExitRequested())
 				{
-					ZEN_INFO("shutdown signal received");
+					ZEN_INFO("shutdown signal for pid {} received", zen::GetCurrentProcessId());
 					Server.RequestExit(0);
 				}
 			}
@@ -244,7 +247,7 @@ ZenEntryPoint::Run()
 	}
 	catch (std::exception& e)
 	{
-		ZEN_CRITICAL("Caught exception in main: {}", e.what());
+		ZEN_CRITICAL("Caught exception in main for process {}: {}", zen::GetCurrentProcessId(), e.what());
 		if (!IsApplicationExitRequested())
 		{
 			RequestApplicationExit(1);
@@ -293,6 +296,7 @@ test_main(int argc, char** argv)
 	zen::zencore_forcelinktests();
 	zen::zenhttp_forcelinktests();
 	zen::zenstore_forcelinktests();
+	zen::zenutil_forcelinktests();
 	zen::z$_forcelink();
 	zen::z$service_forcelink();
 
@@ -334,9 +338,24 @@ main(int argc, char* argv[])
 		ZenServerOptions ServerOptions;
 		ParseCliOptions(argc, argv, ServerOptions);
 
+		std::string_view DeleteReason;
+
 		if (ServerOptions.IsCleanStart)
 		{
-			DeleteDirectories(ServerOptions.DataDir);
+			DeleteReason = "clean start requested"sv;
+		}
+		else if (!ServerOptions.BaseSnapshotDir.empty())
+		{
+			DeleteReason = "will initialize state from base snapshot"sv;
+		}
+
+		if (!DeleteReason.empty())
+		{
+			if (std::filesystem::exists(ServerOptions.DataDir))
+			{
+				ZEN_CONSOLE_INFO("deleting files from '{}' ({})", ServerOptions.DataDir, DeleteReason);
+				DeleteDirectories(ServerOptions.DataDir);
+			}
 		}
 
 		if (!std::filesystem::exists(ServerOptions.DataDir))
@@ -345,18 +364,24 @@ main(int argc, char* argv[])
 			std::filesystem::create_directories(ServerOptions.DataDir);
 		}
 
+		if (!ServerOptions.BaseSnapshotDir.empty())
+		{
+			ZEN_CONSOLE_INFO("copying snapshot from '{}' into '{}", ServerOptions.BaseSnapshotDir, ServerOptions.DataDir);
+			CopyTree(ServerOptions.BaseSnapshotDir, ServerOptions.DataDir, {.EnableClone = true});
+		}
+
 #if ZEN_WITH_TRACE
 		if (ServerOptions.TraceHost.size())
 		{
-			TraceStart(ServerOptions.TraceHost.c_str(), TraceType::Network);
+			TraceStart("zenserver", ServerOptions.TraceHost.c_str(), TraceType::Network);
 		}
 		else if (ServerOptions.TraceFile.size())
 		{
-			TraceStart(ServerOptions.TraceFile.c_str(), TraceType::File);
+			TraceStart("zenserver", ServerOptions.TraceFile.c_str(), TraceType::File);
 		}
 		else
 		{
-			TraceInit();
+			TraceInit("zenserver");
 		}
 		atexit(TraceShutdown);
 #endif	// ZEN_WITH_TRACE
diff --git a/src/zenserver/objectstore/objectstore.cpp b/src/zenserver/objectstore/objectstore.cpp
index 3643e8011..47ef5c8b3 100644
--- a/src/zenserver/objectstore/objectstore.cpp
+++ b/src/zenserver/objectstore/objectstore.cpp
@@ -2,14 +2,18 @@
 
 #include <objectstore/objectstore.h>
 
+#include <zencore/base64.h>
+#include <zencore/compactbinaryvalue.h>
 #include <zencore/filesystem.h>
 #include <zencore/fmtutils.h>
 #include <zencore/logging.h>
 #include <zencore/string.h>
+#include "zencore/compactbinary.h"
 #include "zencore/compactbinarybuilder.h"
 #include "zenhttp/httpcommon.h"
 #include "zenhttp/httpserver.h"
 
+#include <filesystem>
 #include <thread>
 
 ZEN_THIRD_PARTY_INCLUDES_START
@@ -23,6 +27,198 @@ using namespace std::literals;
 
 ZEN_DEFINE_LOG_CATEGORY_STATIC(LogObj, "obj"sv);
 
+class CbXmlWriter
+{
+public:
+	explicit CbXmlWriter(StringBuilderBase& InBuilder) : Builder(InBuilder)
+	{
+		Builder.Append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+		Builder << LINE_TERMINATOR_ANSI;
+	}
+
+	void WriteField(CbFieldView Field)
+	{
+		using namespace std::literals;
+
+		bool					 SkipEndTag = false;
+		const std::u8string_view Tag		= Field.GetU8Name();
+
+		AppendBeginTag(Tag);
+
+		switch (CbValue Accessor = Field.GetValue(); Accessor.GetType())
+		{
+			case CbFieldType::Null:
+				Builder << "Null"sv;
+				break;
+			case CbFieldType::Object:
+			case CbFieldType::UniformObject:
+				{
+					for (CbFieldView It : Field)
+					{
+						WriteField(It);
+					}
+				}
+				break;
+			case CbFieldType::Array:
+			case CbFieldType::UniformArray:
+				{
+					bool FirstField = true;
+					for (CbFieldView It : Field)
+					{
+						if (!FirstField)
+							AppendBeginTag(Tag);
+
+						WriteField(It);
+						AppendEndTag(Tag);
+						FirstField = false;
+					}
+					SkipEndTag = true;
+				}
+				break;
+			case CbFieldType::Binary:
+				AppendBase64String(Accessor.AsBinary());
+				break;
+			case CbFieldType::String:
+				Builder << Accessor.AsU8String();
+				break;
+			case CbFieldType::IntegerPositive:
+				Builder << Accessor.AsIntegerPositive();
+				break;
+			case CbFieldType::IntegerNegative:
+				Builder << Accessor.AsIntegerNegative();
+				break;
+			case CbFieldType::Float32:
+				{
+					const float Value = Accessor.AsFloat32();
+					if (std::isfinite(Value))
+					{
+						Builder.Append(fmt::format("{:.9g}", Value));
+					}
+					else
+					{
+						Builder << "Null"sv;
+					}
+				}
+				break;
+			case CbFieldType::Float64:
+				{
+					const double Value = Accessor.AsFloat64();
+					if (std::isfinite(Value))
+					{
+						Builder.Append(fmt::format("{:.17g}", Value));
+					}
+					else
+					{
+						Builder << "null"sv;
+					}
+				}
+				break;
+			case CbFieldType::BoolFalse:
+				Builder << "False"sv;
+				break;
+			case CbFieldType::BoolTrue:
+				Builder << "True"sv;
+				break;
+			case CbFieldType::ObjectAttachment:
+			case CbFieldType::BinaryAttachment:
+				{
+					Accessor.AsAttachment().ToHexString(Builder);
+				}
+				break;
+			case CbFieldType::Hash:
+				{
+					Accessor.AsHash().ToHexString(Builder);
+				}
+				break;
+			case CbFieldType::Uuid:
+				{
+					Accessor.AsUuid().ToString(Builder);
+				}
+				break;
+			case CbFieldType::DateTime:
+				Builder << DateTime(Accessor.AsDateTimeTicks()).ToIso8601();
+				break;
+			case CbFieldType::TimeSpan:
+				{
+					const TimeSpan Span(Accessor.AsTimeSpanTicks());
+					if (Span.GetDays() == 0)
+					{
+						Builder << Span.ToString("%h:%m:%s.%n");
+					}
+					else
+					{
+						Builder << Span.ToString("%d.%h:%m:%s.%n");
+					}
+					break;
+				}
+			case CbFieldType::ObjectId:
+				Accessor.AsObjectId().ToString(Builder);
+				break;
+			case CbFieldType::CustomById:
+				{
+					CbCustomById Custom = Accessor.AsCustomById();
+
+					AppendBeginTag(u8"Id"sv);
+					Builder << Custom.Id;
+					AppendEndTag(u8"Id"sv);
+
+					AppendBeginTag(u8"Data"sv);
+					AppendBase64String(Custom.Data);
+					AppendEndTag(u8"Data"sv);
+					break;
+				}
+			case CbFieldType::CustomByName:
+				{
+					CbCustomByName Custom = Accessor.AsCustomByName();
+
+					AppendBeginTag(u8"Name"sv);
+					Builder << Custom.Name;
+					AppendEndTag(u8"Name"sv);
+
+					AppendBeginTag(u8"Data"sv);
+					AppendBase64String(Custom.Data);
+					AppendEndTag(u8"Data"sv);
+					break;
+				}
+			default:
+				ZEN_ASSERT(false);
+				break;
+		}
+
+		if (!SkipEndTag)
+			AppendEndTag(Tag);
+	}
+
+private:
+	void AppendBeginTag(std::u8string_view Tag)
+	{
+		if (!Tag.empty())
+		{
+			Builder << '<' << Tag << '>';
+		}
+	}
+
+	void AppendEndTag(std::u8string_view Tag)
+	{
+		if (!Tag.empty())
+		{
+			Builder << "</"sv << Tag << '>';
+		}
+	}
+
+	void AppendBase64String(MemoryView Value)
+	{
+		Builder << '"';
+		ZEN_ASSERT(Value.GetSize() <= 512 * 1024 * 1024);
+		const uint32_t EncodedSize	= Base64::GetEncodedDataSize(uint32_t(Value.GetSize()));
+		const size_t   EncodedIndex = Builder.AddUninitialized(size_t(EncodedSize));
+		Base64::Encode(static_cast<const uint8_t*>(Value.GetData()), uint32_t(Value.GetSize()), Builder.Data() + EncodedIndex);
+	}
+
+private:
+	StringBuilderBase& Builder;
+};
+
 HttpObjectStoreService::HttpObjectStoreService(ObjectStoreConfig Cfg) : m_Cfg(std::move(Cfg))
 {
 	Inititalize();
@@ -51,64 +247,218 @@ HttpObjectStoreService::HandleRequest(zen::HttpServerRequest& Request)
 void
 HttpObjectStoreService::Inititalize()
 {
+	namespace fs = std::filesystem;
 	ZEN_LOG_INFO(LogObj, "Initialzing Object Store in '{}'", m_Cfg.RootDirectory);
-	for (const auto& Bucket : m_Cfg.Buckets)
+
+	const fs::path BucketsPath = m_Cfg.RootDirectory / "buckets";
+	if (!fs::exists(BucketsPath))
 	{
-		ZEN_LOG_INFO(LogObj, " - bucket '{}' -> '{}'", Bucket.Name, Bucket.Directory);
+		CreateDirectories(BucketsPath);
 	}
 
 	m_Router.RegisterRoute(
-		"distributionpoints/{bucket}",
+		"bucket",
+		[this](zen::HttpRouterRequest& Request) { CreateBucket(Request); },
+		HttpVerb::kPost | HttpVerb::kPut);
+
+	m_Router.RegisterRoute(
+		"bucket",
+		[this](zen::HttpRouterRequest& Request) { DeleteBucket(Request); },
+		HttpVerb::kDelete);
+
+	m_Router.RegisterRoute(
+		"bucket/{path}",
 		[this](zen::HttpRouterRequest& Request) {
-			const std::string BucketName = Request.GetCapture(1);
+			const std::string Path	   = Request.GetCapture(1);
+			const auto		  Sep	   = Path.find_last_of('.');
+			const bool		  IsObject = Sep != std::string::npos && Path.size() - Sep > 0;
 
-			ExtendableStringBuilder<1024> Json;
+			if (IsObject)
 			{
-				CbObjectWriter Writer;
-				Writer.BeginArray("distributions");
-				Writer << fmt::format("http://localhost:{}/obj/{}", m_Cfg.ServerPort, BucketName);
-				Writer.EndArray();
-				Writer.Save().ToJson(Json);
+				GetObject(Request, Path);
+			}
+			else
+			{
+				ListBucket(Request, Path);
 			}
-
-			Request.ServerRequest().WriteResponse(HttpResponseCode::OK, HttpContentType::kJSON, Json.ToString());
 		},
-		HttpVerb::kGet);
-
-	m_Router.RegisterRoute(
-		"{bucket}/{path}",
-		[this](zen::HttpRouterRequest& Request) { GetBlob(Request); },
-		HttpVerb::kGet);
+		HttpVerb::kHead | HttpVerb::kGet);
 
 	m_Router.RegisterRoute(
-		"{bucket}/{path}",
-		[this](zen::HttpRouterRequest& Request) { PutBlob(Request); },
+		"bucket/{bucket}/{path}",
+		[this](zen::HttpRouterRequest& Request) { PutObject(Request); },
 		HttpVerb::kPost | HttpVerb::kPut);
 }
 
 std::filesystem::path
 HttpObjectStoreService::GetBucketDirectory(std::string_view BucketName)
 {
-	std::lock_guard _(BucketsMutex);
+	{
+		std::lock_guard _(BucketsMutex);
+
+		if (const auto It = std::find_if(std::begin(m_Cfg.Buckets),
+										 std::end(m_Cfg.Buckets),
+										 [&BucketName](const auto& Bucket) -> bool { return Bucket.Name == BucketName; });
+			It != std::end(m_Cfg.Buckets))
+		{
+			return It->Directory.make_preferred();
+		}
+	}
+
+	return (m_Cfg.RootDirectory / "buckets" / BucketName).make_preferred();
+}
+
+void
+HttpObjectStoreService::CreateBucket(zen::HttpRouterRequest& Request)
+{
+	namespace fs = std::filesystem;
+
+	const CbObject		   Params	  = Request.ServerRequest().ReadPayloadObject();
+	const std::string_view BucketName = Params["bucketname"].AsString();
+
+	if (BucketName.empty())
+	{
+		return Request.ServerRequest().WriteResponse(HttpResponseCode::BadRequest);
+	}
 
-	if (const auto It = std::find_if(std::begin(m_Cfg.Buckets),
-									 std::end(m_Cfg.Buckets),
-									 [&BucketName](const auto& Bucket) -> bool { return Bucket.Name == BucketName; });
-		It != std::end(m_Cfg.Buckets))
+	const fs::path BucketPath = m_Cfg.RootDirectory / "buckets" / BucketName;
 	{
-		return It->Directory;
+		std::lock_guard _(BucketsMutex);
+		if (!fs::exists(BucketPath))
+		{
+			CreateDirectories(BucketPath);
+			ZEN_LOG_INFO(LogObj, "CREATE - new bucket '{}' OK", BucketName);
+			return Request.ServerRequest().WriteResponse(HttpResponseCode::Created);
+		}
 	}
 
-	return std::filesystem::path();
+	ZEN_LOG_INFO(LogObj, "CREATE - existing bucket '{}' OK", BucketName);
+	Request.ServerRequest().WriteResponse(HttpResponseCode::OK);
 }
 
 void
-HttpObjectStoreService::GetBlob(zen::HttpRouterRequest& Request)
+HttpObjectStoreService::ListBucket(zen::HttpRouterRequest& Request, const std::string& Path)
 {
 	namespace fs = std::filesystem;
 
-	const std::string& BucketName = Request.GetCapture(1);
-	const fs::path	   BucketDir  = GetBucketDirectory(BucketName);
+	const auto		  Sep		 = Path.find_first_of('/');
+	const std::string BucketName = Sep == std::string::npos ? Path : Path.substr(0, Sep);
+	if (BucketName.empty())
+	{
+		return Request.ServerRequest().WriteResponse(HttpResponseCode::BadRequest);
+	}
+
+	std::string BucketPrefix = Sep == std::string::npos || Sep == Path.size() - 1 ? std::string() : Path.substr(BucketName.size() + 1);
+	if (BucketPrefix.empty())
+	{
+		const auto QueryParms = Request.ServerRequest().GetQueryParams();
+		if (auto PrefixParam = QueryParms.GetValue("prefix"); PrefixParam.empty() == false)
+		{
+			BucketPrefix = PrefixParam;
+		}
+	}
+	BucketPrefix.erase(0, BucketPrefix.find_first_not_of('/'));
+	BucketPrefix.erase(0, BucketPrefix.find_first_not_of('\\'));
+
+	const fs::path BucketRoot		  = GetBucketDirectory(BucketName);
+	const fs::path RelativeBucketPath = fs::path(BucketPrefix).make_preferred();
+	const fs::path FullPath			  = BucketRoot / RelativeBucketPath;
+
+	struct Visitor : FileSystemTraversal::TreeVisitor
+	{
+		Visitor(const std::string_view BucketName, const fs::path& Path, const fs::path& Prefix) : BucketPath(Path)
+		{
+			Writer.BeginObject("ListBucketResult"sv);
+			Writer << "Name"sv << BucketName;
+			std::string Tmp = Prefix.string();
+			std::replace(Tmp.begin(), Tmp.end(), '\\', '/');
+			Writer << "Prefix"sv << Tmp;
+			Writer.BeginArray("Contents"sv);
+		}
+
+		void VisitFile(const fs::path& Parent, const path_view& File, uint64_t FileSize) override
+		{
+			const fs::path FullPath		= Parent / fs::path(File);
+			fs::path	   RelativePath = fs::relative(FullPath, BucketPath);
+
+			std::string Key = RelativePath.string();
+			std::replace(Key.begin(), Key.end(), '\\', '/');
+
+			Writer.BeginObject();
+			Writer << "Key"sv << Key;
+			Writer << "Size"sv << FileSize;
+			Writer.EndObject();
+		}
+
+		bool VisitDirectory(const std::filesystem::path&, const path_view&) override { return false; }
+
+		CbObject GetResult()
+		{
+			Writer.EndArray();
+			Writer.EndObject();
+			return Writer.Save();
+		}
+
+		CbObjectWriter Writer;
+		fs::path	   BucketPath;
+	};
+
+	Visitor				FileVisitor(BucketName, BucketRoot, RelativeBucketPath);
+	FileSystemTraversal Traversal;
+
+	{
+		std::lock_guard _(BucketsMutex);
+		Traversal.TraverseFileSystem(FullPath, FileVisitor);
+	}
+	CbObject Result = FileVisitor.GetResult();
+
+	if (Request.ServerRequest().AcceptContentType() == HttpContentType::kJSON)
+	{
+		ExtendableStringBuilder<1024> Sb;
+		return Request.ServerRequest().WriteResponse(HttpResponseCode::OK, HttpContentType::kJSON, Result.ToJson(Sb).ToView());
+	}
+
+	ExtendableStringBuilder<1024> Xml;
+	CbXmlWriter					  XmlWriter(Xml);
+	XmlWriter.WriteField(Result.AsFieldView());
+
+	Request.ServerRequest().WriteResponse(HttpResponseCode::OK, HttpContentType::kXML, Xml.ToView());
+}
+
+void
+HttpObjectStoreService::DeleteBucket(zen::HttpRouterRequest& Request)
+{
+	namespace fs = std::filesystem;
+
+	const CbObject		   Params	  = Request.ServerRequest().ReadPayloadObject();
+	const std::string_view BucketName = Params["bucketname"].AsString();
+
+	if (BucketName.empty())
+	{
+		return Request.ServerRequest().WriteResponse(HttpResponseCode::BadRequest);
+	}
+
+	const fs::path BucketPath = m_Cfg.RootDirectory / "buckets" / BucketName;
+	{
+		std::lock_guard _(BucketsMutex);
+		DeleteDirectories(BucketPath);
+	}
+
+	ZEN_LOG_INFO(LogObj, "DELETE - bucket '{}' OK", BucketName);
+	Request.ServerRequest().WriteResponse(HttpResponseCode::OK);
+}
+
+void
+HttpObjectStoreService::GetObject(zen::HttpRouterRequest& Request, const std::string& Path)
+{
+	namespace fs = std::filesystem;
+
+	const auto		  Sep		 = Path.find_first_of('/');
+	const std::string BucketName = Sep == std::string::npos ? Path : Path.substr(0, Sep);
+	const std::string BucketPrefix =
+		Sep == std::string::npos || Sep == Path.size() - 1 ? std::string() : Path.substr(BucketName.size() + 1);
+
+	const fs::path BucketDir = GetBucketDirectory(BucketName);
 
 	if (BucketDir.empty())
 	{
@@ -116,7 +466,7 @@ HttpObjectStoreService::GetBlob(zen::HttpRouterRequest& Request)
 		return Request.ServerRequest().WriteResponse(HttpResponseCode::NotFound);
 	}
 
-	const fs::path RelativeBucketPath = Request.GetCapture(2);
+	const fs::path RelativeBucketPath = fs::path(BucketPrefix).make_preferred();
 
 	if (RelativeBucketPath.is_absolute() || RelativeBucketPath.string().starts_with(".."))
 	{
@@ -124,8 +474,8 @@ HttpObjectStoreService::GetBlob(zen::HttpRouterRequest& Request)
 		return Request.ServerRequest().WriteResponse(HttpResponseCode::Forbidden);
 	}
 
-	fs::path FilePath = BucketDir / RelativeBucketPath;
-	if (fs::exists(FilePath) == false)
+	const fs::path FilePath = BucketDir / RelativeBucketPath;
+	if (!fs::exists(FilePath))
 	{
 		ZEN_LOG_DEBUG(LogObj, "GET - '{}/{}' [FAILED], doesn't exist", BucketName, FilePath);
 		return Request.ServerRequest().WriteResponse(HttpResponseCode::NotFound);
@@ -138,7 +488,12 @@ HttpObjectStoreService::GetBlob(zen::HttpRouterRequest& Request)
 		return Request.ServerRequest().WriteResponse(HttpResponseCode::BadRequest);
 	}
 
-	FileContents File = ReadFile(FilePath);
+	FileContents File;
+	{
+		std::lock_guard _(BucketsMutex);
+		File = ReadFile(FilePath);
+	}
+
 	if (File.ErrorCode)
 	{
 		ZEN_LOG_WARN(LogObj,
@@ -194,7 +549,7 @@ HttpObjectStoreService::GetBlob(zen::HttpRouterRequest& Request)
 }
 
 void
-HttpObjectStoreService::PutBlob(zen::HttpRouterRequest& Request)
+HttpObjectStoreService::PutObject(zen::HttpRouterRequest& Request)
 {
 	namespace fs = std::filesystem;
 
@@ -207,7 +562,7 @@ HttpObjectStoreService::PutBlob(zen::HttpRouterRequest& Request)
 		return Request.ServerRequest().WriteResponse(HttpResponseCode::NotFound);
 	}
 
-	const fs::path RelativeBucketPath = Request.GetCapture(2);
+	const fs::path RelativeBucketPath = fs::path(Request.GetCapture(2)).make_preferred();
 
 	if (RelativeBucketPath.is_absolute() || RelativeBucketPath.string().starts_with(".."))
 	{
@@ -215,17 +570,32 @@ HttpObjectStoreService::PutBlob(zen::HttpRouterRequest& Request)
 		return Request.ServerRequest().WriteResponse(HttpResponseCode::Forbidden);
 	}
 
-	fs::path	   FilePath = BucketDir / RelativeBucketPath;
-	const IoBuffer FileBuf	= Request.ServerRequest().ReadPayload();
+	const fs::path FilePath		 = BucketDir / RelativeBucketPath;
+	const fs::path FileDirectory = FilePath.parent_path();
 
-	if (FileBuf.Size() == 0)
 	{
-		ZEN_LOG_DEBUG(LogObj, "PUT - '{}/{}' [FAILED], empty file", BucketName, FilePath);
-		return Request.ServerRequest().WriteResponse(HttpResponseCode::BadRequest);
+		std::lock_guard _(BucketsMutex);
+
+		if (!fs::exists(FileDirectory))
+		{
+			CreateDirectories(FileDirectory);
+		}
+
+		const IoBuffer FileBuf = Request.ServerRequest().ReadPayload();
+
+		if (FileBuf.Size() == 0)
+		{
+			ZEN_LOG_DEBUG(LogObj, "PUT - '{}' [FAILED], empty file", FilePath);
+			return Request.ServerRequest().WriteResponse(HttpResponseCode::BadRequest);
+		}
+
+		WriteFile(FilePath, FileBuf);
+		ZEN_LOG_DEBUG(LogObj,
+					  "PUT - '{}' [OK] ({})",
+					  (fs::path(BucketName) / RelativeBucketPath).make_preferred(),
+					  NiceBytes(FileBuf.Size()));
 	}
 
-	WriteFile(FilePath, FileBuf);
-	ZEN_LOG_DEBUG(LogObj, "PUT - '{}/{}' [OK] ({})", BucketName, RelativeBucketPath, NiceBytes(FileBuf.Size()));
 	Request.ServerRequest().WriteResponse(HttpResponseCode::OK);
 }
 
diff --git a/src/zenserver/objectstore/objectstore.h b/src/zenserver/objectstore/objectstore.h
index 0fec59b03..c905ceab3 100644
--- a/src/zenserver/objectstore/objectstore.h
+++ b/src/zenserver/objectstore/objectstore.h
@@ -21,7 +21,6 @@ struct ObjectStoreConfig
 
 	std::filesystem::path	  RootDirectory;
 	std::vector<BucketConfig> Buckets;
-	uint16_t				  ServerPort{8558};
 };
 
 class HttpObjectStoreService final : public zen::HttpService
@@ -36,8 +35,11 @@ public:
 private:
 	void				  Inititalize();
 	std::filesystem::path GetBucketDirectory(std::string_view BucketName);
-	void				  GetBlob(zen::HttpRouterRequest& Request);
-	void				  PutBlob(zen::HttpRouterRequest& Request);
+	void				  CreateBucket(zen::HttpRouterRequest& Request);
+	void				  ListBucket(zen::HttpRouterRequest& Request, const std::string& Path);
+	void				  DeleteBucket(zen::HttpRouterRequest& Request);
+	void				  GetObject(zen::HttpRouterRequest& Request, const std::string& Path);
+	void				  PutObject(zen::HttpRouterRequest& Request);
 
 	ObjectStoreConfig	 m_Cfg;
 	std::mutex			 BucketsMutex;
diff --git a/src/zenserver/projectstore/httpprojectstore.cpp b/src/zenserver/projectstore/httpprojectstore.cpp
index 261485834..0ba49cf8a 100644
--- a/src/zenserver/projectstore/httpprojectstore.cpp
+++ b/src/zenserver/projectstore/httpprojectstore.cpp
@@ -276,6 +276,11 @@ HttpProjectService::HttpProjectService(CidStore& Store, ProjectStore* Projects,
 		HttpVerb::kGet);
 
 	m_Router.RegisterRoute(
+		"{project}/oplog/{log}/chunkinfos",
+		[this](HttpRouterRequest& Req) { HandleChunkInfosRequest(Req); },
+		HttpVerb::kGet);
+
+	m_Router.RegisterRoute(
 		"{project}/oplog/{log}/{chunk}/info",
 		[this](HttpRouterRequest& Req) { HandleChunkInfoRequest(Req); },
 		HttpVerb::kGet);
@@ -643,6 +648,41 @@ HttpProjectService::HandleFilesRequest(HttpRouterRequest& Req)
 }
 
 void
+HttpProjectService::HandleChunkInfosRequest(HttpRouterRequest& Req)
+{
+	ZEN_TRACE_CPU("ProjectService::ChunkInfos");
+
+	HttpServerRequest& HttpReq = Req.ServerRequest();
+
+	const auto& ProjectId = Req.GetCapture(1);
+	const auto& OplogId	  = Req.GetCapture(2);
+
+	CbObject								 ResponsePayload;
+	std::pair<HttpResponseCode, std::string> Result = m_ProjectStore->GetProjectChunkInfos(ProjectId, OplogId, ResponsePayload);
+	if (Result.first == HttpResponseCode::OK)
+	{
+		return HttpReq.WriteResponse(HttpResponseCode::OK, ResponsePayload);
+	}
+	else
+	{
+		if (Result.first == HttpResponseCode::BadRequest)
+		{
+			m_ProjectStats.BadRequestCount++;
+		}
+		ZEN_DEBUG("Request {}: '{}' failed with {}. Reason: `{}`",
+				  ToString(HttpReq.RequestVerb()),
+				  HttpReq.QueryString(),
+				  static_cast<int>(Result.first),
+				  Result.second);
+	}
+	if (Result.second.empty())
+	{
+		return HttpReq.WriteResponse(Result.first);
+	}
+	return HttpReq.WriteResponse(Result.first, HttpContentType::kText, Result.second);
+}
+
+void
 HttpProjectService::HandleChunkInfoRequest(HttpRouterRequest& Req)
 {
 	ZEN_TRACE_CPU("ProjectService::ChunkInfo");
diff --git a/src/zenserver/projectstore/httpprojectstore.h b/src/zenserver/projectstore/httpprojectstore.h
index 9998ae83e..9990ee264 100644
--- a/src/zenserver/projectstore/httpprojectstore.h
+++ b/src/zenserver/projectstore/httpprojectstore.h
@@ -64,6 +64,7 @@ private:
 	void HandleProjectListRequest(HttpRouterRequest& Req);
 	void HandleChunkBatchRequest(HttpRouterRequest& Req);
 	void HandleFilesRequest(HttpRouterRequest& Req);
+	void HandleChunkInfosRequest(HttpRouterRequest& Req);
 	void HandleChunkInfoRequest(HttpRouterRequest& Req);
 	void HandleChunkByIdRequest(HttpRouterRequest& Req);
 	void HandleChunkByCidRequest(HttpRouterRequest& Req);
diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp
index 9fedd9165..73cb35fb8 100644
--- a/src/zenserver/projectstore/projectstore.cpp
+++ b/src/zenserver/projectstore/projectstore.cpp
@@ -2,6 +2,7 @@
 
 #include "projectstore.h"
 
+#include <zencore/assertfmt.h>
 #include <zencore/compactbinarybuilder.h>
 #include <zencore/compactbinarypackage.h>
 #include <zencore/compactbinaryutil.h>
@@ -298,38 +299,60 @@ struct ProjectStore::OplogStorage : public RefCounted
 
 		Stopwatch Timer;
 
-		uint64_t InvalidEntries = 0;
+		uint64_t InvalidEntries	  = 0;
+		uint64_t TombstoneEntries = 0;
 
 		std::vector<OplogEntry> OpLogEntries;
 		std::vector<size_t>		OplogOrder;
 		{
-			tsl::robin_map<XXH3_128, size_t, XXH3_128::Hasher> LatestKeys;
+			tsl::robin_map<Oid, size_t, Oid::Hasher> LatestKeys;
+			const uint64_t							 SkipEntryCount = 0;
+
 			m_Oplog.Replay(
 				[&](const OplogEntry& LogEntry) {
-					if (LogEntry.OpCoreSize == 0)
+					if (LogEntry.IsTombstone())
 					{
-						++InvalidEntries;
-						return;
+						if (auto It = LatestKeys.find(LogEntry.OpKeyHash); It == LatestKeys.end())
+						{
+							ZEN_SCOPED_WARN("found tombstone referencing unknown key {}", LogEntry.OpKeyHash);
+						}
+					}
+					else
+					{
+						if (LogEntry.OpCoreSize == 0)
+						{
+							++InvalidEntries;
+							return;
+						}
+
+						const uint64_t OpFileOffset = LogEntry.OpCoreOffset * m_OpsAlign;
+						m_NextOpsOffset =
+							Max(m_NextOpsOffset.load(std::memory_order_relaxed), RoundUp(OpFileOffset + LogEntry.OpCoreSize, m_OpsAlign));
+						m_MaxLsn = Max(m_MaxLsn.load(std::memory_order_relaxed), LogEntry.OpLsn);
 					}
-					const uint64_t OpFileOffset = LogEntry.OpCoreOffset * m_OpsAlign;
-					m_NextOpsOffset =
-						Max(m_NextOpsOffset.load(std::memory_order_relaxed), RoundUp(OpFileOffset + LogEntry.OpCoreSize, m_OpsAlign));
-					m_MaxLsn = Max(m_MaxLsn.load(std::memory_order_relaxed), LogEntry.OpLsn);
 
 					if (auto It = LatestKeys.find(LogEntry.OpKeyHash); It != LatestKeys.end())
 					{
-						OpLogEntries[It->second] = LogEntry;
+						OplogEntry& Entry = OpLogEntries[It->second];
+
+						if (LogEntry.IsTombstone() && Entry.IsTombstone())
+						{
+							ZEN_SCOPED_WARN("found double tombstone - '{}'", LogEntry.OpKeyHash);
+						}
+
+						Entry = LogEntry;
 					}
 					else
 					{
-						size_t OpIndex				   = OpLogEntries.size();
+						const size_t OpIndex		   = OpLogEntries.size();
 						LatestKeys[LogEntry.OpKeyHash] = OpIndex;
 						OplogOrder.push_back(OpIndex);
 						OpLogEntries.push_back(LogEntry);
 					}
 				},
-				0);
+				SkipEntryCount);
 		}
+
 		std::sort(OplogOrder.begin(), OplogOrder.end(), [&](size_t Lhs, size_t Rhs) {
 			const OplogEntry& LhsEntry = OpLogEntries[Lhs];
 			const OplogEntry& RhsEntry = OpLogEntries[Rhs];
@@ -342,47 +365,54 @@ struct ProjectStore::OplogStorage : public RefCounted
 		{
 			const OplogEntry& LogEntry = OpLogEntries[OplogOrderIndex];
 
-			const uint64_t OpFileOffset = LogEntry.OpCoreOffset * m_OpsAlign;
-			MemoryView	   OpBufferView = OpBlobsBuffer.MakeView(LogEntry.OpCoreSize, OpFileOffset);
-			if (OpBufferView.GetSize() == LogEntry.OpCoreSize)
+			if (LogEntry.IsTombstone())
+			{
+				TombstoneEntries++;
+			}
+			else
 			{
 				// Verify checksum, ignore op data if incorrect
-				const auto OpCoreHash = uint32_t(XXH3_64bits(OpBufferView.GetData(), LogEntry.OpCoreSize) & 0xffffFFFF);
 
-				if (OpCoreHash != LogEntry.OpCoreHash)
-				{
-					ZEN_WARN("skipping oplog entry with bad checksum!");
-					InvalidEntries++;
-					continue;
-				}
-				Handler(CbObjectView(OpBufferView.GetData()), LogEntry);
-				continue;
-			}
+				auto VerifyAndHandleOp = [&](MemoryView OpBufferView) {
+					const uint32_t OpCoreHash = uint32_t(XXH3_64bits(OpBufferView.GetData(), LogEntry.OpCoreSize) & 0xffffFFFF);
 
-			IoBuffer OpBuffer(LogEntry.OpCoreSize);
-			OpBlobsBuffer.Read((void*)OpBuffer.Data(), LogEntry.OpCoreSize, OpFileOffset);
+					if (OpCoreHash == LogEntry.OpCoreHash)
+					{
+						Handler(CbObjectView(OpBufferView.GetData()), LogEntry);
+					}
+					else
+					{
+						ZEN_WARN("skipping oplog entry with bad checksum!");
+						InvalidEntries++;
+					}
+				};
 
-			// Verify checksum, ignore op data if incorrect
-			const auto OpCoreHash = uint32_t(XXH3_64bits(OpBuffer.Data(), LogEntry.OpCoreSize) & 0xffffFFFF);
+				const uint64_t	 OpFileOffset = LogEntry.OpCoreOffset * m_OpsAlign;
+				const MemoryView OpBufferView = OpBlobsBuffer.MakeView(LogEntry.OpCoreSize, OpFileOffset);
+				if (OpBufferView.GetSize() == LogEntry.OpCoreSize)
+				{
+					VerifyAndHandleOp(OpBufferView);
+				}
+				else
+				{
+					IoBuffer OpBuffer(LogEntry.OpCoreSize);
+					OpBlobsBuffer.Read((void*)OpBuffer.Data(), LogEntry.OpCoreSize, OpFileOffset);
 
-			if (OpCoreHash != LogEntry.OpCoreHash)
-			{
-				ZEN_WARN("skipping oplog entry with bad checksum!");
-				InvalidEntries++;
-				continue;
+					VerifyAndHandleOp(OpBuffer);
+				}
 			}
-			Handler(CbObjectView(OpBuffer.Data()), LogEntry);
 		}
 
 		if (InvalidEntries)
 		{
-			ZEN_WARN("ignored {} zero-sized oplog entries", InvalidEntries);
+			ZEN_WARN("ignored {} invalid oplog entries", InvalidEntries);
 		}
 
-		ZEN_INFO("Oplog replay completed in {} - Max LSN# {}, Next offset: {}",
+		ZEN_INFO("oplog replay completed in {} - Max LSN# {}, Next offset: {}, {} tombstones",
 				 NiceTimeSpanMs(Timer.GetElapsedTimeMs()),
 				 m_MaxLsn.load(),
-				 m_NextOpsOffset.load());
+				 m_NextOpsOffset.load(),
+				 TombstoneEntries);
 	}
 
 	void ReplayLogEntries(const std::span<OplogEntryAddress> Entries, std::function<void(CbObjectView)>&& Handler)
@@ -418,7 +448,7 @@ struct ProjectStore::OplogStorage : public RefCounted
 		return CbObject(SharedBuffer(std::move(OpBuffer)));
 	}
 
-	OplogEntry AppendOp(SharedBuffer Buffer, uint32_t OpCoreHash, XXH3_128 KeyHash)
+	OplogEntry AppendOp(SharedBuffer Buffer, uint32_t OpCoreHash, Oid KeyHash)
 	{
 		ZEN_TRACE_CPU("Store::OplogStorage::AppendOp");
 
@@ -446,6 +476,14 @@ struct ProjectStore::OplogStorage : public RefCounted
 		return Entry;
 	}
 
+	void AppendTombstone(Oid KeyHash)
+	{
+		OplogEntry Entry = {.OpKeyHash = KeyHash};
+		Entry.MakeTombstone();
+
+		m_Oplog.Append(Entry);
+	}
+
 	void Flush()
 	{
 		m_Oplog.Flush();
@@ -507,9 +545,67 @@ ProjectStore::Oplog::Flush()
 }
 
 void
-ProjectStore::Oplog::ScrubStorage(ScrubContext& Ctx) const
+ProjectStore::Oplog::ScrubStorage(ScrubContext& Ctx)
 {
-	ZEN_UNUSED(Ctx);
+	std::vector<Oid> BadEntryKeys;
+
+	using namespace std::literals;
+
+	IterateOplogWithKey([&](int Lsn, const Oid& Key, CbObjectView Op) {
+		ZEN_UNUSED(Lsn);
+
+		std::vector<IoHash> Cids;
+		Op.IterateAttachments([&](CbFieldView Visitor) { Cids.emplace_back(Visitor.AsAttachment()); });
+
+		{
+			XXH3_128Stream KeyHasher;
+			Op["key"sv].WriteToStream([&](const void* Data, size_t Size) { KeyHasher.Append(Data, Size); });
+			XXH3_128 KeyHash128 = KeyHasher.GetHash();
+			Oid		 KeyHash;
+			memcpy(&KeyHash, KeyHash128.Hash, sizeof KeyHash);
+
+			ZEN_ASSERT_FORMAT(KeyHash == Key, "oplog data does not match information from index (op:{} != index:{})", KeyHash, Key);
+		}
+
+		for (const IoHash& Cid : Cids)
+		{
+			if (!m_CidStore.ContainsChunk(Cid))
+			{
+				// oplog entry references a CAS chunk which is not
+				// present
+				BadEntryKeys.push_back(Key);
+				return;
+			}
+			if (Ctx.IsBadCid(Cid))
+			{
+				// oplog entry references a CAS chunk which has been
+				// flagged as bad
+				BadEntryKeys.push_back(Key);
+				return;
+			}
+		}
+	});
+
+	if (!BadEntryKeys.empty())
+	{
+		if (Ctx.RunRecovery())
+		{
+			ZEN_WARN("scrubbing found {} bad ops in oplog @ '{}', these will be removed from the index", BadEntryKeys.size(), m_BasePath);
+
+			// Actually perform some clean-up
+			RwLock::ExclusiveLockScope _(m_OplogLock);
+
+			for (const auto& Key : BadEntryKeys)
+			{
+				m_LatestOpMap.erase(Key);
+				m_Storage->AppendTombstone(Key);
+			}
+		}
+		else
+		{
+			ZEN_WARN("scrubbing found {} bad ops in oplog @ '{}' but no cleanup will be performed", BadEntryKeys.size(), m_BasePath);
+		}
+	}
 }
 
 void
@@ -658,6 +754,8 @@ ProjectStore::Oplog::Update(const std::filesystem::path& MarkerPath)
 void
 ProjectStore::Oplog::ReplayLog()
 {
+	ZEN_LOG_SCOPE("ReplayLog '{}'", m_OplogId);
+
 	RwLock::ExclusiveLockScope OplogLock(m_OplogLock);
 	if (!m_Storage)
 	{
@@ -752,6 +850,21 @@ ProjectStore::Oplog::GetAllChunksInfo()
 }
 
 void
+ProjectStore::Oplog::IterateChunkMap(std::function<void(const Oid&, const IoHash&)>&& Fn)
+{
+	RwLock::SharedLockScope _(m_OplogLock);
+	if (!m_Storage)
+	{
+		return;
+	}
+
+	for (const auto& Kv : m_ChunkMap)
+	{
+		Fn(Kv.first, Kv.second);
+	}
+}
+
+void
 ProjectStore::Oplog::IterateFileMap(
 	std::function<void(const Oid&, const std::string_view& ServerPath, const std::string_view& ClientPath)>&& Fn)
 {
@@ -803,41 +916,55 @@ ProjectStore::Oplog::IterateOplogWithKey(std::function<void(int, const Oid&, CbO
 		return;
 	}
 
-	std::vector<size_t>			   EntryIndexes;
-	std::vector<OplogEntryAddress> Entries;
-	std::vector<Oid>			   Keys;
-	std::vector<int>			   LSNs;
-	Entries.reserve(m_LatestOpMap.size());
-	EntryIndexes.reserve(m_LatestOpMap.size());
-	Keys.reserve(m_LatestOpMap.size());
-	LSNs.reserve(m_LatestOpMap.size());
+	std::vector<OplogEntryAddress> SortedEntries;
+	std::vector<Oid>			   SortedKeys;
+	std::vector<int>			   SortedLSNs;
 
-	for (const auto& Kv : m_LatestOpMap)
 	{
-		const auto AddressEntry = m_OpAddressMap.find(Kv.second);
-		ZEN_ASSERT(AddressEntry != m_OpAddressMap.end());
+		const auto TargetEntryCount = m_LatestOpMap.size();
 
-		Entries.push_back(AddressEntry->second);
-		Keys.push_back(Kv.first);
-		LSNs.push_back(Kv.second);
-		EntryIndexes.push_back(EntryIndexes.size());
-	}
+		std::vector<size_t>			   EntryIndexes;
+		std::vector<OplogEntryAddress> Entries;
+		std::vector<Oid>			   Keys;
+		std::vector<int>			   LSNs;
 
-	std::sort(EntryIndexes.begin(), EntryIndexes.end(), [&Entries](const size_t& Lhs, const size_t& Rhs) {
-		const OplogEntryAddress& LhsEntry = Entries[Lhs];
-		const OplogEntryAddress& RhsEntry = Entries[Rhs];
-		return LhsEntry.Offset < RhsEntry.Offset;
-	});
-	std::vector<OplogEntryAddress> SortedEntries;
-	SortedEntries.reserve(EntryIndexes.size());
-	for (size_t Index : EntryIndexes)
-	{
-		SortedEntries.push_back(Entries[Index]);
+		Entries.reserve(TargetEntryCount);
+		EntryIndexes.reserve(TargetEntryCount);
+		Keys.reserve(TargetEntryCount);
+		LSNs.reserve(TargetEntryCount);
+
+		for (const auto& Kv : m_LatestOpMap)
+		{
+			const auto AddressEntry = m_OpAddressMap.find(Kv.second);
+			ZEN_ASSERT(AddressEntry != m_OpAddressMap.end());
+
+			Entries.push_back(AddressEntry->second);
+			Keys.push_back(Kv.first);
+			LSNs.push_back(Kv.second);
+			EntryIndexes.push_back(EntryIndexes.size());
+		}
+
+		std::sort(EntryIndexes.begin(), EntryIndexes.end(), [&Entries](const size_t& Lhs, const size_t& Rhs) {
+			const OplogEntryAddress& LhsEntry = Entries[Lhs];
+			const OplogEntryAddress& RhsEntry = Entries[Rhs];
+			return LhsEntry.Offset < RhsEntry.Offset;
+		});
+
+		SortedEntries.reserve(EntryIndexes.size());
+		SortedKeys.reserve(EntryIndexes.size());
+		SortedLSNs.reserve(EntryIndexes.size());
+
+		for (size_t Index : EntryIndexes)
+		{
+			SortedEntries.push_back(Entries[Index]);
+			SortedKeys.push_back(Keys[Index]);
+			SortedLSNs.push_back(LSNs[Index]);
+		}
 	}
 
 	size_t EntryIndex = 0;
 	m_Storage->ReplayLogEntries(SortedEntries, [&](CbObjectView Op) {
-		Handler(LSNs[EntryIndex], Keys[EntryIndex], Op);
+		Handler(SortedLSNs[EntryIndex], SortedKeys[EntryIndex], Op);
 		EntryIndex++;
 	});
 }
@@ -1015,7 +1142,7 @@ ProjectStore::Oplog::GetMapping(CbObjectView Core)
 				}
 				if (ClientPath.empty())
 				{
-					ZEN_WARN("invalid file for entry '{}', missing 'both 'clientpath'", Id);
+					ZEN_WARN("invalid file for entry '{}', missing 'clientpath' field", Id);
 					continue;
 				}
 
@@ -1073,7 +1200,7 @@ ProjectStore::Oplog::RegisterOplogEntry(RwLock::ExclusiveLockScope& OplogLock,
 	}
 
 	m_OpAddressMap.emplace(OpEntry.OpLsn, OplogEntryAddress{.Offset = OpEntry.OpCoreOffset, .Size = OpEntry.OpCoreSize});
-	m_LatestOpMap[OpEntry.OpKeyAsOId()] = OpEntry.OpLsn;
+	m_LatestOpMap[OpEntry.OpKeyHash] = OpEntry.OpLsn;
 
 	return OpEntry.OpLsn;
 }
@@ -1135,7 +1262,9 @@ ProjectStore::Oplog::AppendNewOplogEntry(CbObject Core)
 
 	XXH3_128Stream KeyHasher;
 	Core["key"sv].WriteToStream([&](const void* Data, size_t Size) { KeyHasher.Append(Data, Size); });
-	XXH3_128 KeyHash = KeyHasher.GetHash();
+	XXH3_128 KeyHash128 = KeyHasher.GetHash();
+	Oid		 KeyHash;
+	memcpy(&KeyHash, KeyHash128.Hash, sizeof KeyHash);
 
 	RefPtr<OplogStorage> Storage;
 	{
@@ -1435,31 +1564,40 @@ ProjectStore::Project::OpenOplog(std::string_view OplogId)
 	return nullptr;
 }
 
-void
-ProjectStore::Project::DeleteOplog(std::string_view OplogId)
+std::filesystem::path
+ProjectStore::Project::RemoveOplog(std::string_view OplogId)
 {
+	RwLock::ExclusiveLockScope _(m_ProjectLock);
+
 	std::filesystem::path DeletePath;
+	if (auto OplogIt = m_Oplogs.find(std::string(OplogId)); OplogIt == m_Oplogs.end())
 	{
-		RwLock::ExclusiveLockScope _(m_ProjectLock);
+		std::filesystem::path OplogBasePath = BasePathForOplog(OplogId);
 
-		if (auto OplogIt = m_Oplogs.find(std::string(OplogId)); OplogIt == m_Oplogs.end())
+		if (Oplog::ExistsAt(OplogBasePath))
 		{
-			std::filesystem::path OplogBasePath = BasePathForOplog(OplogId);
-
-			if (Oplog::ExistsAt(OplogBasePath))
+			std::filesystem::path MovedDir;
+			if (PrepareDirectoryDelete(DeletePath, MovedDir))
 			{
-				DeletePath = OplogBasePath;
+				DeletePath = MovedDir;
 			}
 		}
-		else
-		{
-			std::unique_ptr<Oplog>& Oplog = OplogIt->second;
-			DeletePath					  = Oplog->PrepareForDelete(true);
-			m_DeletedOplogs.emplace_back(std::move(Oplog));
-			m_Oplogs.erase(OplogIt);
-		}
-		m_LastAccessTimes.erase(std::string(OplogId));
 	}
+	else
+	{
+		std::unique_ptr<Oplog>& Oplog = OplogIt->second;
+		DeletePath					  = Oplog->PrepareForDelete(true);
+		m_DeletedOplogs.emplace_back(std::move(Oplog));
+		m_Oplogs.erase(OplogIt);
+	}
+	m_LastAccessTimes.erase(std::string(OplogId));
+	return DeletePath;
+}
+
+void
+ProjectStore::Project::DeleteOplog(std::string_view OplogId)
+{
+	std::filesystem::path DeletePath = RemoveOplog(OplogId);
 
 	// Erase content on disk
 	if (!DeletePath.empty())
@@ -1521,7 +1659,7 @@ ProjectStore::Project::ScrubStorage(ScrubContext& Ctx)
 	{
 		OpenOplog(OpLogId);
 	}
-	IterateOplogs([&](const RwLock::SharedLockScope& ProjectLock, const Oplog& Ops) {
+	IterateOplogs([&](const RwLock::SharedLockScope& ProjectLock, Oplog& Ops) {
 		if (!IsExpired(ProjectLock, GcClock::TimePoint::min(), Ops))
 		{
 			Ops.ScrubStorage(Ctx);
@@ -1567,9 +1705,29 @@ ProjectStore::Project::GatherReferences(GcContext& GcCtx)
 }
 
 uint64_t
+ProjectStore::Project::TotalSize(const std::filesystem::path& BasePath)
+{
+	using namespace std::literals;
+
+	uint64_t			  Size				  = 0;
+	std::filesystem::path AccessTimesFilePath = BasePath / "AccessTimes.zcb"sv;
+	if (std::filesystem::exists(AccessTimesFilePath))
+	{
+		Size += std::filesystem::file_size(AccessTimesFilePath);
+	}
+	std::filesystem::path ProjectFilePath = BasePath / "Project.zcb"sv;
+	if (std::filesystem::exists(ProjectFilePath))
+	{
+		Size += std::filesystem::file_size(ProjectFilePath);
+	}
+
+	return Size;
+}
+
+uint64_t
 ProjectStore::Project::TotalSize() const
 {
-	uint64_t Result = 0;
+	uint64_t Result = TotalSize(m_OplogStoragePath);
 	{
 		std::vector<std::string> OpLogs = ScanForOplogs();
 		for (const std::string& OpLogId : OpLogs)
@@ -1730,6 +1888,10 @@ ProjectStore::DiscoverProjects()
 	for (const std::filesystem::path& DirPath : DirContent.Directories)
 	{
 		std::string DirName = PathToUtf8(DirPath.filename());
+		if (DirName.starts_with("[dropped]"))
+		{
+			continue;
+		}
 		OpenProject(DirName);
 	}
 }
@@ -1954,7 +2116,7 @@ ProjectStore::StorageSize() const
 				std::filesystem::path ProjectStateFilePath = ProjectBasePath / "Project.zcb"sv;
 				if (std::filesystem::exists(ProjectStateFilePath))
 				{
-					Result.DiskSize += std::filesystem::file_size(ProjectStateFilePath);
+					Result.DiskSize += Project::TotalSize(ProjectBasePath);
 					DirectoryContent DirContent;
 					GetDirectoryContent(ProjectBasePath, DirectoryContent::IncludeDirsFlag, DirContent);
 					for (const std::filesystem::path& OplogBasePath : DirContent.Directories)
@@ -2068,12 +2230,8 @@ ProjectStore::UpdateProject(std::string_view ProjectId,
 }
 
 bool
-ProjectStore::DeleteProject(std::string_view ProjectId)
+ProjectStore::RemoveProject(std::string_view ProjectId, std::filesystem::path& OutDeletePath)
 {
-	ZEN_TRACE_CPU("Store::DeleteProject");
-
-	ZEN_INFO("deleting project {}", ProjectId);
-
 	RwLock::ExclusiveLockScope ProjectsLock(m_ProjectsLock);
 
 	auto ProjIt = m_Projects.find(std::string{ProjectId});
@@ -2083,20 +2241,34 @@ ProjectStore::DeleteProject(std::string_view ProjectId)
 		return true;
 	}
 
-	std::filesystem::path DeletePath;
-	bool				  Success = ProjIt->second->PrepareForDelete(DeletePath);
+	bool Success = ProjIt->second->PrepareForDelete(OutDeletePath);
 
 	if (!Success)
 	{
 		return false;
 	}
 	m_Projects.erase(ProjIt);
-	ProjectsLock.ReleaseNow();
+	return true;
+}
+
+bool
+ProjectStore::DeleteProject(std::string_view ProjectId)
+{
+	ZEN_TRACE_CPU("Store::DeleteProject");
+
+	ZEN_INFO("deleting project {}", ProjectId);
+
+	std::filesystem::path DeletePath;
+	if (!RemoveProject(ProjectId, DeletePath))
+	{
+		return false;
+	}
 
 	if (!DeletePath.empty())
 	{
 		DeleteDirectories(DeletePath);
 	}
+
 	return true;
 }
 
@@ -2172,9 +2344,9 @@ ProjectStore::GetProjectFiles(const std::string_view ProjectId, const std::strin
 }
 
 std::pair<HttpResponseCode, std::string>
-ProjectStore::GetProjectChunks(const std::string_view ProjectId, const std::string_view OplogId, CbObject& OutPayload)
+ProjectStore::GetProjectChunkInfos(const std::string_view ProjectId, const std::string_view OplogId, CbObject& OutPayload)
 {
-	ZEN_TRACE_CPU("ProjectStore::GetProjectChunks");
+	ZEN_TRACE_CPU("ProjectStore::GetProjectChunkInfos");
 
 	using namespace std::literals;
 
@@ -2192,21 +2364,22 @@ ProjectStore::GetProjectChunks(const std::string_view ProjectId, const std::stri
 	}
 	Project->TouchOplog(OplogId);
 
-	std::vector<ProjectStore::Oplog::ChunkInfo> ChunkInfo = FoundLog->GetAllChunksInfo();
+	std::vector<std::pair<Oid, IoHash>> ChunkInfos;
+	FoundLog->IterateChunkMap([&ChunkInfos](const Oid& Id, const IoHash& Hash) { ChunkInfos.push_back({Id, Hash}); });
 
 	CbObjectWriter Response;
+	Response.BeginArray("chunkinfos"sv);
 
-	Response.BeginArray("chunks"sv);
-	for (ProjectStore::Oplog::ChunkInfo& Info : ChunkInfo)
+	for (const auto& ChunkInfo : ChunkInfos)
 	{
-		Response << Info.ChunkId;
-	}
-	Response.EndArray();
-
-	Response.BeginArray("sizes"sv);
-	for (ProjectStore::Oplog::ChunkInfo& Info : ChunkInfo)
-	{
-		Response << Info.ChunkSize;
+		if (IoBuffer Chunk = FoundLog->FindChunk(ChunkInfo.first))
+		{
+			Response.BeginObject();
+			Response << "id"sv << ChunkInfo.first;
+			Response << "rawhash"sv << ChunkInfo.second;
+			Response << "rawsize"sv << Chunk.GetSize();
+			Response.EndObject();
+		}
 	}
 	Response.EndArray();
 
@@ -3042,36 +3215,120 @@ ProjectStore::GetGcName(GcCtx&)
 	return fmt::format("projectstore:'{}'", m_ProjectBasePath.string());
 }
 
-void
-ProjectStore::RemoveExpiredData(GcCtx& Ctx, GcReferencerStats& Stats)
+class ProjectStoreGcStoreCompactor : public GcStoreCompactor
 {
-	size_t	   ProjectCount		   = 0;
-	size_t	   ExpiredProjectCount = 0;
-	size_t	   OplogCount		   = 0;
-	size_t	   ExpiredOplogCount   = 0;
+public:
+	ProjectStoreGcStoreCompactor(const std::filesystem::path&		  BasePath,
+								 std::vector<std::filesystem::path>&& OplogPathsToRemove,
+								 std::vector<std::filesystem::path>&& ProjectPathsToRemove)
+	: m_BasePath(BasePath)
+	, m_OplogPathsToRemove(std::move(OplogPathsToRemove))
+	, m_ProjectPathsToRemove(std::move(ProjectPathsToRemove))
+	{
+	}
+
+	virtual void CompactStore(GcCtx& Ctx, GcCompactStoreStats& Stats, const std::function<uint64_t()>&)
+	{
+		ZEN_TRACE_CPU("Store::CompactStore");
+
+		Stopwatch  Timer;
+		const auto _ = MakeGuard([&] {
+			if (!Ctx.Settings.Verbose)
+			{
+				return;
+			}
+			ZEN_INFO("GCV2: projectstore [COMPACT] '{}': RemovedDisk: {} in {}",
+					 m_BasePath,
+					 NiceBytes(Stats.RemovedDisk),
+					 NiceTimeSpanMs(Timer.GetElapsedTimeMs()));
+		});
+
+		if (Ctx.Settings.IsDeleteMode)
+		{
+			for (const std::filesystem::path& OplogPath : m_OplogPathsToRemove)
+			{
+				uint64_t OplogSize = ProjectStore::Oplog::TotalSize(OplogPath);
+				if (DeleteDirectories(OplogPath))
+				{
+					ZEN_DEBUG("GCV2: projectstore [COMPACT] '{}': removed oplog folder '{}', removed {}",
+							  m_BasePath,
+							  OplogPath,
+							  NiceBytes(OplogSize));
+					Stats.RemovedDisk += OplogSize;
+				}
+				else
+				{
+					ZEN_WARN("GCV2: projectstore [COMPACT] '{}': Failed to remove oplog folder '{}'", m_BasePath, OplogPath);
+				}
+			}
+
+			for (const std::filesystem::path& ProjectPath : m_ProjectPathsToRemove)
+			{
+				uint64_t ProjectSize = ProjectStore::Project::TotalSize(ProjectPath);
+				if (DeleteDirectories(ProjectPath))
+				{
+					ZEN_DEBUG("GCV2: projectstore [COMPACT] '{}': removed project folder '{}', removed {}",
+							  m_BasePath,
+							  ProjectPath,
+							  NiceBytes(ProjectSize));
+					Stats.RemovedDisk += ProjectSize;
+				}
+				else
+				{
+					ZEN_WARN("GCV2: projectstore [COMPACT] '{}': Failed to remove project folder '{}'", m_BasePath, ProjectPath);
+				}
+			}
+		}
+		else
+		{
+			ZEN_DEBUG("GCV2: projectstore [COMPACT] '{}': Skipped deleting of {} oplogs and {} projects",
+					  m_BasePath,
+					  m_OplogPathsToRemove.size(),
+					  m_ProjectPathsToRemove.size());
+		}
+
+		m_ProjectPathsToRemove.clear();
+		m_OplogPathsToRemove.clear();
+	}
+
+private:
+	std::filesystem::path			   m_BasePath;
+	std::vector<std::filesystem::path> m_OplogPathsToRemove;
+	std::vector<std::filesystem::path> m_ProjectPathsToRemove;
+};
+
+GcStoreCompactor*
+ProjectStore::RemoveExpiredData(GcCtx& Ctx, GcStats& Stats)
+{
+	ZEN_TRACE_CPU("Store::RemoveExpiredData");
+
 	Stopwatch  Timer;
 	const auto _ = MakeGuard([&] {
 		if (!Ctx.Settings.Verbose)
 		{
 			return;
 		}
-		ZEN_INFO("GCV2: projectstore [REMOVE EXPIRED] '{}': Count: {}, Expired: {}, Deleted: {}, RemovedDisk: {}, RemovedMemory: {} in {}",
+		ZEN_INFO("GCV2: projectstore [REMOVE EXPIRED] '{}': Count: {}, Expired: {}, Deleted: {} in {}",
 				 m_ProjectBasePath,
-				 Stats.Count,
-				 Stats.Expired,
-				 Stats.Deleted,
-				 NiceBytes(Stats.RemovedDisk),
-				 NiceBytes(Stats.RemovedMemory),
+				 Stats.CheckedCount,
+				 Stats.FoundCount,
+				 Stats.DeletedCount,
 				 NiceTimeSpanMs(Timer.GetElapsedTimeMs()));
 	});
 
+	std::vector<std::filesystem::path> OplogPathsToRemove;
+	std::vector<std::filesystem::path> ProjectPathsToRemove;
+
 	std::vector<Ref<Project>> ExpiredProjects;
 	std::vector<Ref<Project>> Projects;
 
+	DiscoverProjects();
+
 	{
 		RwLock::SharedLockScope Lock(m_ProjectsLock);
 		for (auto& Kv : m_Projects)
 		{
+			Stats.CheckedCount++;
 			if (Kv.second->IsExpired(Lock, Ctx.Settings.ProjectStoreExpireTime))
 			{
 				ExpiredProjects.push_back(Kv.second);
@@ -3083,12 +3340,30 @@ ProjectStore::RemoveExpiredData(GcCtx& Ctx, GcReferencerStats& Stats)
 
 	for (const Ref<Project>& Project : Projects)
 	{
+		std::vector<std::string> OpLogs = Project->ScanForOplogs();
+		for (const std::string& OpLogId : OpLogs)
+		{
+			Project->OpenOplog(OpLogId);
+			if (Ctx.IsCancelledFlag)
+			{
+				return nullptr;
+			}
+		}
+	}
+
+	size_t ExpiredOplogCount = 0;
+	for (const Ref<Project>& Project : Projects)
+	{
+		if (Ctx.IsCancelledFlag)
+		{
+			break;
+		}
+
 		std::vector<std::string> ExpiredOplogs;
 		{
-			RwLock::ExclusiveLockScope __(m_ProjectsLock);
 			Project->IterateOplogs(
-				[&Ctx, &Project, &ExpiredOplogs, &OplogCount](const RwLock::SharedLockScope& Lock, ProjectStore::Oplog& Oplog) {
-					OplogCount++;
+				[&Ctx, &Stats, &Project, &ExpiredOplogs](const RwLock::SharedLockScope& Lock, ProjectStore::Oplog& Oplog) {
+					Stats.CheckedCount++;
 					if (Project->IsExpired(Lock, Ctx.Settings.ProjectStoreExpireTime, Oplog))
 					{
 						ExpiredOplogs.push_back(Oplog.OplogId());
@@ -3101,105 +3376,112 @@ ProjectStore::RemoveExpiredData(GcCtx& Ctx, GcReferencerStats& Stats)
 		{
 			for (const std::string& OplogId : ExpiredOplogs)
 			{
-				std::filesystem::path OplogBasePath = ProjectPath / OplogId;
-				uint64_t			  OplogSize		= Oplog::TotalSize(OplogBasePath);
-				ZEN_DEBUG("gc project store '{}': garbage collected oplog '{}' in project '{}'. Removing storage on disk",
-						  m_ProjectBasePath,
-						  OplogId,
-						  Project->Identifier);
-				Project->DeleteOplog(OplogId);
-				Stats.RemovedDisk += OplogSize;
+				std::filesystem::path RemovePath = Project->RemoveOplog(OplogId);
+				if (!RemovePath.empty())
+				{
+					OplogPathsToRemove.push_back(RemovePath);
+				}
 			}
-			Stats.Deleted += ExpiredOplogs.size();
+			Stats.DeletedCount += ExpiredOplogs.size();
 			Project->Flush();
 		}
 	}
-	ProjectCount = Projects.size();
-	Stats.Count += ProjectCount + OplogCount;
-	ExpiredProjectCount = ExpiredProjects.size();
 
-	if (ExpiredProjects.empty())
+	if (ExpiredProjects.empty() && ExpiredOplogCount == 0)
 	{
-		ZEN_DEBUG("gc project store '{}': no expired projects found", m_ProjectBasePath);
-		return;
+		ZEN_DEBUG("GCV2: projectstore [REMOVE EXPIRED] '{}': no expired projects found", m_ProjectBasePath);
+		return nullptr;
 	}
 
 	if (Ctx.Settings.IsDeleteMode)
 	{
 		for (const Ref<Project>& Project : ExpiredProjects)
 		{
-			std::filesystem::path PathToRemove;
-			std::string			  ProjectId = Project->Identifier;
+			std::string ProjectId = Project->Identifier;
 			{
 				{
 					RwLock::SharedLockScope Lock(m_ProjectsLock);
 					if (!Project->IsExpired(Lock, Ctx.Settings.ProjectStoreExpireTime))
 					{
-						ZEN_DEBUG("gc project store '{}': skipped garbage collect of project '{}'. Project no longer expired.",
-								  m_ProjectBasePath,
-								  ProjectId);
+						ZEN_DEBUG(
+							"GCV2: projectstore [REMOVE EXPIRED] '{}': skipped garbage collect of project '{}'. Project no longer "
+							"expired.",
+							m_ProjectBasePath,
+							ProjectId);
 						continue;
 					}
 				}
-				RwLock::ExclusiveLockScope __(m_ProjectsLock);
-				bool					   Success = Project->PrepareForDelete(PathToRemove);
+				std::filesystem::path RemovePath;
+				bool				  Success = RemoveProject(ProjectId, RemovePath);
 				if (!Success)
 				{
-					ZEN_DEBUG("gc project store '{}': skipped garbage collect of project '{}'. Project folder is locked.",
-							  m_ProjectBasePath,
-							  ProjectId);
+					ZEN_DEBUG(
+						"GCV2: projectstore [REMOVE EXPIRED] '{}': skipped garbage collect of project '{}'. Project folder is locked.",
+						m_ProjectBasePath,
+						ProjectId);
 					continue;
 				}
-				m_Projects.erase(ProjectId);
-			}
-
-			ZEN_DEBUG("gc project store '{}': sgarbage collected project '{}'. Removing storage on disk", m_ProjectBasePath, ProjectId);
-			if (PathToRemove.empty())
-			{
-				continue;
+				if (!RemovePath.empty())
+				{
+					ProjectPathsToRemove.push_back(RemovePath);
+				}
 			}
-
-			DeleteDirectories(PathToRemove);
 		}
-		Stats.Deleted += ExpiredProjects.size();
+		Stats.DeletedCount += ExpiredProjects.size();
 	}
 
-	Stats.Expired += ExpiredOplogCount + ExpiredProjectCount;
+	size_t ExpiredProjectCount = ExpiredProjects.size();
+	Stats.FoundCount += ExpiredOplogCount + ExpiredProjectCount;
+	if (!OplogPathsToRemove.empty() || !ProjectPathsToRemove.empty())
+	{
+		return new ProjectStoreGcStoreCompactor(m_ProjectBasePath, std::move(OplogPathsToRemove), std::move(ProjectPathsToRemove));
+	}
+	return nullptr;
 }
 
 class ProjectStoreReferenceChecker : public GcReferenceChecker
 {
 public:
-	ProjectStoreReferenceChecker(GcCtx& Ctx, ProjectStore::Oplog& Owner, bool PreCache) : m_Oplog(Owner)
+	ProjectStoreReferenceChecker(ProjectStore::Oplog& Owner, bool PreCache) : m_Oplog(Owner), m_PreCache(PreCache) {}
+
+	virtual ~ProjectStoreReferenceChecker() {}
+
+	virtual void PreCache(GcCtx& Ctx) override
 	{
-		if (PreCache)
+		if (m_PreCache)
 		{
+			ZEN_TRACE_CPU("Store::PreCache");
+
 			Stopwatch  Timer;
 			const auto _ = MakeGuard([&] {
 				if (!Ctx.Settings.Verbose)
 				{
 					return;
 				}
-				ZEN_INFO("GCV2: projectstore [LOCKSTATE] '{}': precached {} references in {} from {}/{}",
+				ZEN_INFO("GCV2: projectstore [PRECACHE] '{}': precached {} references in {} from {}/{}",
 						 m_Oplog.m_BasePath,
-						 m_UncachedReferences.size(),
+						 m_References.size(),
 						 NiceTimeSpanMs(Timer.GetElapsedTimeMs()),
 						 m_Oplog.m_OuterProject->Identifier,
 						 m_Oplog.OplogId());
 			});
 
 			RwLock::SharedLockScope __(m_Oplog.m_OplogLock);
+			if (Ctx.IsCancelledFlag)
+			{
+				return;
+			}
 			m_Oplog.IterateOplog([&](CbObjectView Op) {
-				Op.IterateAttachments([&](CbFieldView Visitor) { m_UncachedReferences.insert(Visitor.AsAttachment()); });
+				Op.IterateAttachments([&](CbFieldView Visitor) { m_References.emplace_back(Visitor.AsAttachment()); });
 			});
 			m_PreCachedLsn = m_Oplog.GetMaxOpIndex();
 		}
 	}
 
-	virtual ~ProjectStoreReferenceChecker() {}
-
 	virtual void LockState(GcCtx& Ctx) override
 	{
+		ZEN_TRACE_CPU("Store::LockState");
+
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
 			if (!Ctx.Settings.Verbose)
@@ -3208,7 +3490,7 @@ public:
 			}
 			ZEN_INFO("GCV2: projectstore [LOCKSTATE] '{}': found {} references in {} from {}/{}",
 					 m_Oplog.m_BasePath,
-					 m_UncachedReferences.size(),
+					 m_References.size(),
 					 NiceTimeSpanMs(Timer.GetElapsedTimeMs()),
 					 m_Oplog.m_OuterProject->Identifier,
 					 m_Oplog.OplogId());
@@ -3219,29 +3501,56 @@ public:
 		{
 			// TODO: Maybe we could just check the added oplog entries - we might get a few extra references from obsolete entries
 			// but I don't think that would be critical
-			m_UncachedReferences.clear();
+			m_References.resize(0);
 			m_Oplog.IterateOplog([&](CbObjectView Op) {
-				Op.IterateAttachments([&](CbFieldView Visitor) { m_UncachedReferences.insert(Visitor.AsAttachment()); });
+				Op.IterateAttachments([&](CbFieldView Visitor) { m_References.emplace_back(Visitor.AsAttachment()); });
 			});
 		}
 	}
 
-	virtual void RemoveUsedReferencesFromSet(GcCtx&, HashSet& IoCids) override
+	virtual void RemoveUsedReferencesFromSet(GcCtx& Ctx, HashSet& IoCids) override
 	{
-		for (const IoHash& ReferenceHash : m_UncachedReferences)
+		ZEN_TRACE_CPU("Store::RemoveUsedReferencesFromSet");
+
+		ZEN_ASSERT(m_OplogLock);
+
+		size_t	   InitialCount = IoCids.size();
+		Stopwatch  Timer;
+		const auto _ = MakeGuard([&] {
+			if (!Ctx.Settings.Verbose)
+			{
+				return;
+			}
+			ZEN_INFO("GCV2: projectstore [FILTER REFERENCES] '{}': filtered out {} used references out of {} in {}",
+					 m_Oplog.m_BasePath,
+					 InitialCount - IoCids.size(),
+					 InitialCount,
+					 NiceTimeSpanMs(Timer.GetElapsedTimeMs()));
+		});
+
+		for (const IoHash& ReferenceHash : m_References)
 		{
-			IoCids.erase(ReferenceHash);
+			if (IoCids.erase(ReferenceHash) == 1)
+			{
+				if (IoCids.empty())
+				{
+					return;
+				}
+			}
 		}
 	}
 	ProjectStore::Oplog&					 m_Oplog;
+	bool									 m_PreCache;
 	std::unique_ptr<RwLock::SharedLockScope> m_OplogLock;
-	HashSet									 m_UncachedReferences;
+	std::vector<IoHash>						 m_References;
 	int										 m_PreCachedLsn = -1;
 };
 
 std::vector<GcReferenceChecker*>
 ProjectStore::CreateReferenceCheckers(GcCtx& Ctx)
 {
+	ZEN_TRACE_CPU("Store::CreateReferenceCheckers");
+
 	size_t ProjectCount = 0;
 	size_t OplogCount	= 0;
 
@@ -3283,7 +3592,7 @@ ProjectStore::CreateReferenceCheckers(GcCtx& Ctx)
 				ProjectStore::Oplog* Oplog		 = Project->OpenOplog(OpLogId);
 				GcClock::TimePoint	 Now		 = GcClock::Now();
 				bool				 TryPreCache = Project->LastOplogAccessTime(OpLogId) < (Now - std::chrono::minutes(5));
-				Checkers.emplace_back(new ProjectStoreReferenceChecker(Ctx, *Oplog, TryPreCache));
+				Checkers.emplace_back(new ProjectStoreReferenceChecker(*Oplog, TryPreCache));
 			}
 			OplogCount += OpLogs.size();
 		}
@@ -3478,11 +3787,17 @@ TEST_CASE("project.store.gc")
 		BasicFile ProjectFile;
 		ProjectFile.Open(Project2FilePath, BasicFile::Mode::kTruncate);
 	}
-	std::filesystem::path Project2OplogPath = TempDir.Path() / "game1" / "saves" / "cooked" / ".projectstore";
+	std::filesystem::path Project2Oplog1Path = TempDir.Path() / "game1" / "saves" / "cooked" / ".projectstore";
+	{
+		CreateDirectories(Project2Oplog1Path.parent_path());
+		BasicFile OplogFile;
+		OplogFile.Open(Project2Oplog1Path, BasicFile::Mode::kTruncate);
+	}
+	std::filesystem::path Project2Oplog2Path = TempDir.Path() / "game2" / "saves" / "cooked" / ".projectstore";
 	{
-		CreateDirectories(Project2OplogPath.parent_path());
+		CreateDirectories(Project2Oplog2Path.parent_path());
 		BasicFile OplogFile;
-		OplogFile.Open(Project2OplogPath, BasicFile::Mode::kTruncate);
+		OplogFile.Open(Project2Oplog2Path, BasicFile::Mode::kTruncate);
 	}
 
 	{
@@ -3508,94 +3823,212 @@ TEST_CASE("project.store.gc")
 																	EngineRootDir.string(),
 																	Project2RootDir.string(),
 																	Project2FilePath.string()));
-		ProjectStore::Oplog*	   Oplog = Project2->NewOplog("oplog2", Project2OplogPath);
-		CHECK(Oplog != nullptr);
-
-		Oplog->AppendNewOplogEntry(CreateOplogPackage(Oid::NewOid(), {}));
-		Oplog->AppendNewOplogEntry(CreateOplogPackage(Oid::NewOid(), CreateAttachments(std::initializer_list<size_t>{177})));
-		Oplog->AppendNewOplogEntry(CreateOplogPackage(Oid::NewOid(), CreateAttachments(std::initializer_list<size_t>{9123, 383, 590, 96})));
-		Oplog->AppendNewOplogEntry(CreateOplogPackage(Oid::NewOid(), CreateAttachments(std::initializer_list<size_t>{535, 221})));
+		{
+			ProjectStore::Oplog* Oplog = Project2->NewOplog("oplog2", Project2Oplog1Path);
+			CHECK(Oplog != nullptr);
+
+			Oplog->AppendNewOplogEntry(CreateOplogPackage(Oid::NewOid(), {}));
+			Oplog->AppendNewOplogEntry(CreateOplogPackage(Oid::NewOid(), CreateAttachments(std::initializer_list<size_t>{177})));
+			Oplog->AppendNewOplogEntry(
+				CreateOplogPackage(Oid::NewOid(), CreateAttachments(std::initializer_list<size_t>{9123, 383, 590, 96})));
+			Oplog->AppendNewOplogEntry(CreateOplogPackage(Oid::NewOid(), CreateAttachments(std::initializer_list<size_t>{535, 221})));
+		}
+		{
+			ProjectStore::Oplog* Oplog = Project2->NewOplog("oplog3", Project2Oplog2Path);
+			CHECK(Oplog != nullptr);
+
+			Oplog->AppendNewOplogEntry(CreateOplogPackage(Oid::NewOid(), {}));
+			Oplog->AppendNewOplogEntry(CreateOplogPackage(Oid::NewOid(), CreateAttachments(std::initializer_list<size_t>{137})));
+			Oplog->AppendNewOplogEntry(
+				CreateOplogPackage(Oid::NewOid(), CreateAttachments(std::initializer_list<size_t>{9723, 683, 594, 98})));
+			Oplog->AppendNewOplogEntry(CreateOplogPackage(Oid::NewOid(), CreateAttachments(std::initializer_list<size_t>{531, 271})));
+		}
 	}
 
+	SUBCASE("v1")
 	{
-		GcContext GcCtx(GcClock::Now() - std::chrono::hours(24), GcClock::Now() - std::chrono::hours(24));
-		ProjectStore.GatherReferences(GcCtx);
-		size_t RefCount = 0;
-		GcCtx.IterateCids([&RefCount](const IoHash&) { RefCount++; });
-		CHECK(RefCount == 14);
-		ProjectStore.CollectGarbage(GcCtx);
-		CHECK(ProjectStore.OpenProject("proj1"sv));
-		CHECK(ProjectStore.OpenProject("proj2"sv));
-	}
+		{
+			GcContext GcCtx(GcClock::Now() - std::chrono::hours(24), GcClock::Now() - std::chrono::hours(24));
+			ProjectStore.GatherReferences(GcCtx);
+			size_t RefCount = 0;
+			GcCtx.IterateCids([&RefCount](const IoHash&) { RefCount++; });
+			CHECK(RefCount == 21);
+			ProjectStore.CollectGarbage(GcCtx);
+			CHECK(ProjectStore.OpenProject("proj1"sv));
+			CHECK(ProjectStore.OpenProject("proj2"sv));
+		}
 
-	{
-		GcContext GcCtx(GcClock::Now() + std::chrono::hours(24), GcClock::Now() + std::chrono::hours(24));
-		ProjectStore.GatherReferences(GcCtx);
-		size_t RefCount = 0;
-		GcCtx.IterateCids([&RefCount](const IoHash&) { RefCount++; });
-		CHECK(RefCount == 14);
-		ProjectStore.CollectGarbage(GcCtx);
-		CHECK(ProjectStore.OpenProject("proj1"sv));
-		CHECK(ProjectStore.OpenProject("proj2"sv));
-	}
+		{
+			GcContext GcCtx(GcClock::Now() + std::chrono::hours(24), GcClock::Now() + std::chrono::hours(24));
+			ProjectStore.GatherReferences(GcCtx);
+			size_t RefCount = 0;
+			GcCtx.IterateCids([&RefCount](const IoHash&) { RefCount++; });
+			CHECK(RefCount == 21);
+			ProjectStore.CollectGarbage(GcCtx);
+			CHECK(ProjectStore.OpenProject("proj1"sv));
+			CHECK(ProjectStore.OpenProject("proj2"sv));
+		}
 
-	std::filesystem::remove(Project1FilePath);
+		std::filesystem::remove(Project1FilePath);
 
-	{
-		GcContext GcCtx(GcClock::Now() - std::chrono::hours(24), GcClock::Now() - std::chrono::hours(24));
-		ProjectStore.GatherReferences(GcCtx);
-		size_t RefCount = 0;
-		GcCtx.IterateCids([&RefCount](const IoHash&) { RefCount++; });
-		CHECK(RefCount == 14);
-		ProjectStore.CollectGarbage(GcCtx);
-		CHECK(ProjectStore.OpenProject("proj1"sv));
-		CHECK(ProjectStore.OpenProject("proj2"sv));
-	}
+		{
+			GcContext GcCtx(GcClock::Now() - std::chrono::hours(24), GcClock::Now() - std::chrono::hours(24));
+			ProjectStore.GatherReferences(GcCtx);
+			size_t RefCount = 0;
+			GcCtx.IterateCids([&RefCount](const IoHash&) { RefCount++; });
+			CHECK(RefCount == 21);
+			ProjectStore.CollectGarbage(GcCtx);
+			CHECK(ProjectStore.OpenProject("proj1"sv));
+			CHECK(ProjectStore.OpenProject("proj2"sv));
+		}
 
-	{
-		GcContext GcCtx(GcClock::Now() + std::chrono::hours(24), GcClock::Now() + std::chrono::hours(24));
-		ProjectStore.GatherReferences(GcCtx);
-		size_t RefCount = 0;
-		GcCtx.IterateCids([&RefCount](const IoHash&) { RefCount++; });
-		CHECK(RefCount == 7);
-		ProjectStore.CollectGarbage(GcCtx);
-		CHECK(!ProjectStore.OpenProject("proj1"sv));
-		CHECK(ProjectStore.OpenProject("proj2"sv));
-	}
+		{
+			GcContext GcCtx(GcClock::Now() + std::chrono::hours(24), GcClock::Now() + std::chrono::hours(24));
+			ProjectStore.GatherReferences(GcCtx);
+			size_t RefCount = 0;
+			GcCtx.IterateCids([&RefCount](const IoHash&) { RefCount++; });
+			CHECK(RefCount == 14);
+			ProjectStore.CollectGarbage(GcCtx);
+			CHECK(!ProjectStore.OpenProject("proj1"sv));
+			CHECK(ProjectStore.OpenProject("proj2"sv));
+		}
 
-	std::filesystem::remove(Project2OplogPath);
-	{
-		GcContext GcCtx(GcClock::Now() - std::chrono::hours(24), GcClock::Now() - std::chrono::hours(24));
-		ProjectStore.GatherReferences(GcCtx);
-		size_t RefCount = 0;
-		GcCtx.IterateCids([&RefCount](const IoHash&) { RefCount++; });
-		CHECK(RefCount == 7);
-		ProjectStore.CollectGarbage(GcCtx);
-		CHECK(!ProjectStore.OpenProject("proj1"sv));
-		CHECK(ProjectStore.OpenProject("proj2"sv));
-	}
+		std::filesystem::remove(Project2Oplog1Path);
+		{
+			GcContext GcCtx(GcClock::Now() - std::chrono::hours(24), GcClock::Now() - std::chrono::hours(24));
+			ProjectStore.GatherReferences(GcCtx);
+			size_t RefCount = 0;
+			GcCtx.IterateCids([&RefCount](const IoHash&) { RefCount++; });
+			CHECK(RefCount == 14);
+			ProjectStore.CollectGarbage(GcCtx);
+			CHECK(!ProjectStore.OpenProject("proj1"sv));
+			CHECK(ProjectStore.OpenProject("proj2"sv));
+		}
 
-	{
-		GcContext GcCtx(GcClock::Now() + std::chrono::hours(24), GcClock::Now() + std::chrono::hours(24));
-		ProjectStore.GatherReferences(GcCtx);
-		size_t RefCount = 0;
-		GcCtx.IterateCids([&RefCount](const IoHash&) { RefCount++; });
-		CHECK(RefCount == 0);
-		ProjectStore.CollectGarbage(GcCtx);
-		CHECK(!ProjectStore.OpenProject("proj1"sv));
-		CHECK(ProjectStore.OpenProject("proj2"sv));
+		{
+			GcContext GcCtx(GcClock::Now() + std::chrono::hours(24), GcClock::Now() + std::chrono::hours(24));
+			ProjectStore.GatherReferences(GcCtx);
+			size_t RefCount = 0;
+			GcCtx.IterateCids([&RefCount](const IoHash&) { RefCount++; });
+			CHECK(RefCount == 7);
+			ProjectStore.CollectGarbage(GcCtx);
+			CHECK(!ProjectStore.OpenProject("proj1"sv));
+			CHECK(ProjectStore.OpenProject("proj2"sv));
+		}
+
+		std::filesystem::remove(Project2FilePath);
+		{
+			GcContext GcCtx(GcClock::Now() + std::chrono::hours(24), GcClock::Now() + std::chrono::hours(24));
+			ProjectStore.GatherReferences(GcCtx);
+			size_t RefCount = 0;
+			GcCtx.IterateCids([&RefCount](const IoHash&) { RefCount++; });
+			CHECK(RefCount == 0);
+			ProjectStore.CollectGarbage(GcCtx);
+			CHECK(!ProjectStore.OpenProject("proj1"sv));
+			CHECK(!ProjectStore.OpenProject("proj2"sv));
+		}
 	}
 
-	std::filesystem::remove(Project2FilePath);
+	SUBCASE("v2")
 	{
-		GcContext GcCtx(GcClock::Now() + std::chrono::hours(24), GcClock::Now() + std::chrono::hours(24));
-		ProjectStore.GatherReferences(GcCtx);
-		size_t RefCount = 0;
-		GcCtx.IterateCids([&RefCount](const IoHash&) { RefCount++; });
-		CHECK(RefCount == 0);
-		ProjectStore.CollectGarbage(GcCtx);
-		CHECK(!ProjectStore.OpenProject("proj1"sv));
-		CHECK(!ProjectStore.OpenProject("proj2"sv));
+		{
+			GcSettings Settings = {.CacheExpireTime		   = GcClock::Now() - std::chrono::hours(24),
+								   .ProjectStoreExpireTime = GcClock::Now() - std::chrono::hours(24),
+								   .IsDeleteMode		   = true};
+			GcResult   Result	= Gc.CollectGarbage(Settings);
+			CHECK_EQ(5u, Result.ReferencerStatSum.RemoveExpiredDataStats.CheckedCount);
+			CHECK_EQ(0u, Result.ReferencerStatSum.RemoveExpiredDataStats.DeletedCount);
+			CHECK_EQ(21u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.CheckedCount);
+			CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.DeletedCount);
+			CHECK(ProjectStore.OpenProject("proj1"sv));
+			CHECK(ProjectStore.OpenProject("proj2"sv));
+		}
+
+		{
+			GcSettings Settings = {.CacheExpireTime		   = GcClock::Now() + std::chrono::hours(24),
+								   .ProjectStoreExpireTime = GcClock::Now() + std::chrono::hours(24),
+								   .IsDeleteMode		   = true};
+			GcResult   Result	= Gc.CollectGarbage(Settings);
+			CHECK_EQ(5u, Result.ReferencerStatSum.RemoveExpiredDataStats.CheckedCount);
+			CHECK_EQ(0u, Result.ReferencerStatSum.RemoveExpiredDataStats.DeletedCount);
+			CHECK_EQ(21u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.CheckedCount);
+			CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.DeletedCount);
+			CHECK(ProjectStore.OpenProject("proj1"sv));
+			CHECK(ProjectStore.OpenProject("proj2"sv));
+		}
+
+		std::filesystem::remove(Project1FilePath);
+
+		{
+			GcSettings Settings = {.CacheExpireTime		   = GcClock::Now() - std::chrono::hours(24),
+								   .ProjectStoreExpireTime = GcClock::Now() - std::chrono::hours(24),
+								   .IsDeleteMode		   = true};
+			GcResult   Result	= Gc.CollectGarbage(Settings);
+			CHECK_EQ(5u, Result.ReferencerStatSum.RemoveExpiredDataStats.CheckedCount);
+			CHECK_EQ(0u, Result.ReferencerStatSum.RemoveExpiredDataStats.DeletedCount);
+			CHECK_EQ(21u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.CheckedCount);
+			CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.DeletedCount);
+			CHECK(ProjectStore.OpenProject("proj1"sv));
+			CHECK(ProjectStore.OpenProject("proj2"sv));
+		}
+
+		{
+			GcSettings Settings = {.CacheExpireTime		   = GcClock::Now() + std::chrono::hours(24),
+								   .ProjectStoreExpireTime = GcClock::Now() + std::chrono::hours(24),
+								   .CollectSmallObjects	   = true,
+								   .IsDeleteMode		   = true};
+			GcResult   Result	= Gc.CollectGarbage(Settings);
+			CHECK_EQ(4u, Result.ReferencerStatSum.RemoveExpiredDataStats.CheckedCount);
+			CHECK_EQ(1u, Result.ReferencerStatSum.RemoveExpiredDataStats.DeletedCount);
+			CHECK_EQ(21u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.CheckedCount);
+			CHECK_EQ(7u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.DeletedCount);
+			CHECK(!ProjectStore.OpenProject("proj1"sv));
+			CHECK(ProjectStore.OpenProject("proj2"sv));
+		}
+
+		std::filesystem::remove(Project2Oplog1Path);
+		{
+			GcSettings Settings = {.CacheExpireTime		   = GcClock::Now() - std::chrono::hours(24),
+								   .ProjectStoreExpireTime = GcClock::Now() - std::chrono::hours(24),
+								   .CollectSmallObjects	   = true,
+								   .IsDeleteMode		   = true};
+			GcResult   Result	= Gc.CollectGarbage(Settings);
+			CHECK_EQ(3u, Result.ReferencerStatSum.RemoveExpiredDataStats.CheckedCount);
+			CHECK_EQ(0u, Result.ReferencerStatSum.RemoveExpiredDataStats.DeletedCount);
+			CHECK_EQ(14u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.CheckedCount);
+			CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.DeletedCount);
+			CHECK(!ProjectStore.OpenProject("proj1"sv));
+			CHECK(ProjectStore.OpenProject("proj2"sv));
+		}
+
+		{
+			GcSettings Settings = {.CacheExpireTime		   = GcClock::Now() + std::chrono::hours(24),
+								   .ProjectStoreExpireTime = GcClock::Now() + std::chrono::hours(24),
+								   .CollectSmallObjects	   = true,
+								   .IsDeleteMode		   = true};
+			GcResult   Result	= Gc.CollectGarbage(Settings);
+			CHECK_EQ(3u, Result.ReferencerStatSum.RemoveExpiredDataStats.CheckedCount);
+			CHECK_EQ(0u, Result.ReferencerStatSum.RemoveExpiredDataStats.DeletedCount);
+			CHECK_EQ(14u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.CheckedCount);
+			CHECK_EQ(0u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.DeletedCount);
+			CHECK(!ProjectStore.OpenProject("proj1"sv));
+			CHECK(ProjectStore.OpenProject("proj2"sv));
+		}
+
+		std::filesystem::remove(Project2FilePath);
+		{
+			GcSettings Settings = {.CacheExpireTime		   = GcClock::Now() + std::chrono::hours(24),
+								   .ProjectStoreExpireTime = GcClock::Now() + std::chrono::hours(24),
+								   .CollectSmallObjects	   = true,
+								   .IsDeleteMode		   = true};
+			GcResult   Result	= Gc.CollectGarbage(Settings);
+			CHECK_EQ(1u, Result.ReferencerStatSum.RemoveExpiredDataStats.CheckedCount);
+			CHECK_EQ(1u, Result.ReferencerStatSum.RemoveExpiredDataStats.DeletedCount);
+			CHECK_EQ(14u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.CheckedCount);
+			CHECK_EQ(14u, Result.ReferenceStoreStatSum.RemoveUnreferencedDataStats.DeletedCount);
+			CHECK(!ProjectStore.OpenProject("proj1"sv));
+			CHECK(!ProjectStore.OpenProject("proj2"sv));
+		}
 	}
 }
 
diff --git a/src/zenserver/projectstore/projectstore.h b/src/zenserver/projectstore/projectstore.h
index fe1068485..5ebcd420c 100644
--- a/src/zenserver/projectstore/projectstore.h
+++ b/src/zenserver/projectstore/projectstore.h
@@ -31,14 +31,11 @@ struct OplogEntry
 	uint32_t OpCoreOffset;	// note: Multiple of alignment!
 	uint32_t OpCoreSize;
 	uint32_t OpCoreHash;  // Used as checksum
-	XXH3_128 OpKeyHash;	  // XXH128_canonical_t
+	Oid		 OpKeyHash;
+	uint32_t Reserved;
 
-	inline Oid OpKeyAsOId() const
-	{
-		Oid Id;
-		memcpy(Id.OidBits, &OpKeyHash, sizeof Id.OidBits);
-		return Id;
-	}
+	inline bool IsTombstone() const { return OpCoreOffset == 0 && OpCoreSize == 0 && OpLsn == 0; }
+	inline void MakeTombstone() { OpLsn = OpCoreOffset = OpCoreSize = OpCoreHash = Reserved = 0; }
 };
 
 struct OplogEntryAddress
@@ -93,6 +90,7 @@ public:
 		};
 
 		std::vector<ChunkInfo> GetAllChunksInfo();
+		void				   IterateChunkMap(std::function<void(const Oid&, const IoHash& Hash)>&& Fn);
 		void IterateFileMap(std::function<void(const Oid&, const std::string_view& ServerPath, const std::string_view& ClientPath)>&& Fn);
 		void IterateOplog(std::function<void(CbObjectView)>&& Fn);
 		void IterateOplogWithKey(std::function<void(int, const Oid&, CbObjectView)>&& Fn);
@@ -126,7 +124,7 @@ public:
 
 		LoggerRef		Log() { return m_OuterProject->Log(); }
 		void			Flush();
-		void			ScrubStorage(ScrubContext& Ctx) const;
+		void			ScrubStorage(ScrubContext& Ctx);
 		void			GatherReferences(GcContext& GcCtx);
 		static uint64_t TotalSize(const std::filesystem::path& BasePath);
 		uint64_t		TotalSize() const;
@@ -225,6 +223,7 @@ public:
 		Oplog*					 NewOplog(std::string_view OplogId, const std::filesystem::path& MarkerPath);
 		Oplog*					 OpenOplog(std::string_view OplogId);
 		void					 DeleteOplog(std::string_view OplogId);
+		std::filesystem::path	 RemoveOplog(std::string_view OplogId);
 		void					 IterateOplogs(std::function<void(const RwLock::SharedLockScope&, const Oplog&)>&& Fn) const;
 		void					 IterateOplogs(std::function<void(const RwLock::SharedLockScope&, Oplog&)>&& Fn);
 		std::vector<std::string> ScanForOplogs() const;
@@ -245,6 +244,7 @@ public:
 		void					  ScrubStorage(ScrubContext& Ctx);
 		LoggerRef				  Log();
 		void					  GatherReferences(GcContext& GcCtx);
+		static uint64_t			  TotalSize(const std::filesystem::path& BasePath);
 		uint64_t				  TotalSize() const;
 		bool					  PrepareForDelete(std::filesystem::path& OutDeletePath);
 
@@ -280,6 +280,7 @@ public:
 							   std::string_view EngineRootDir,
 							   std::string_view ProjectRootDir,
 							   std::string_view ProjectFilePath);
+	bool		 RemoveProject(std::string_view ProjectId, std::filesystem::path& OutDeletePath);
 	bool		 DeleteProject(std::string_view ProjectId);
 	bool		 Exists(std::string_view ProjectId);
 	void		 Flush();
@@ -295,7 +296,7 @@ public:
 	virtual GcStorageSize StorageSize() const override;
 
 	virtual std::string						 GetGcName(GcCtx& Ctx) override;
-	virtual void							 RemoveExpiredData(GcCtx& Ctx, GcReferencerStats& Stats) override;
+	virtual GcStoreCompactor*				 RemoveExpiredData(GcCtx& Ctx, GcStats& Stats) override;
 	virtual std::vector<GcReferenceChecker*> CreateReferenceCheckers(GcCtx& Ctx) override;
 
 	CbArray									 GetProjectsList();
@@ -303,9 +304,9 @@ public:
 															 const std::string_view OplogId,
 															 bool					FilterClient,
 															 CbObject&				OutPayload);
-	std::pair<HttpResponseCode, std::string> GetProjectChunks(const std::string_view ProjectId,
-															  const std::string_view OplogId,
-															  CbObject&				 OutPayload);
+	std::pair<HttpResponseCode, std::string> GetProjectChunkInfos(const std::string_view ProjectId,
+																  const std::string_view OplogId,
+																  CbObject&				 OutPayload);
 	std::pair<HttpResponseCode, std::string> GetChunkInfo(const std::string_view ProjectId,
 														  const std::string_view OplogId,
 														  const std::string_view ChunkId,
@@ -379,6 +380,8 @@ private:
 	const DiskWriteBlocker*				m_DiskWriteBlocker = nullptr;
 
 	std::filesystem::path BasePathForProject(std::string_view ProjectId);
+
+	friend class ProjectStoreGcStoreCompactor;
 };
 
 void prj_forcelink();
diff --git a/src/zenserver/projectstore/remoteprojectstore.cpp b/src/zenserver/projectstore/remoteprojectstore.cpp
index d5d229e42..826c8ff51 100644
--- a/src/zenserver/projectstore/remoteprojectstore.cpp
+++ b/src/zenserver/projectstore/remoteprojectstore.cpp
@@ -13,6 +13,7 @@
 #include <zencore/timer.h>
 #include <zencore/workthreadpool.h>
 #include <zenstore/cidstore.h>
+#include <zenutil/workerpools.h>
 
 #include <unordered_map>
 
@@ -802,10 +803,7 @@ BuildContainer(CidStore&																	ChunkStore,
 			   const std::function<void(const std::unordered_set<IoHash, IoHash::Hasher>)>& OnBlockChunks,
 			   tsl::robin_map<IoHash, IoBuffer, IoHash::Hasher>*							OutOptionalTempAttachments)
 {
-	// We are creating a worker thread pool here since we are uploading a lot of attachments in one go and we dont want to keep a
-	// WorkerThreadPool alive
-	size_t			 WorkerCount = Min(std::thread::hardware_concurrency(), 16u);
-	WorkerThreadPool WorkerPool(gsl::narrow<int>(WorkerCount));
+	WorkerThreadPool& WorkerPool = GetSmallWorkerPool();
 
 	AsyncRemoteResult RemoteResult;
 	CbObject		  ContainerObject = BuildContainer(ChunkStore,
@@ -1153,10 +1151,7 @@ SaveOplog(CidStore&				 ChunkStore,
 
 	Stopwatch Timer;
 
-	// We are creating a worker thread pool here since we are uploading a lot of attachments in one go
-	// Doing upload is a rare and transient occation so we don't want to keep a WorkerThreadPool alive.
-	size_t			 WorkerCount = Min(std::thread::hardware_concurrency(), 16u);
-	WorkerThreadPool WorkerPool(gsl::narrow<int>(WorkerCount), "oplog_upload"sv);
+	WorkerThreadPool& WorkerPool = GetSmallWorkerPool();
 
 	std::filesystem::path AttachmentTempPath;
 	if (UseTempBlocks)
@@ -1528,10 +1523,7 @@ LoadOplog(CidStore&			   ChunkStore,
 
 	Stopwatch Timer;
 
-	// We are creating a worker thread pool here since we are download a lot of attachments in one go and we dont want to keep a
-	// WorkerThreadPool alive
-	size_t			 WorkerCount = Min(std::thread::hardware_concurrency(), 16u);
-	WorkerThreadPool WorkerPool(gsl::narrow<int>(WorkerCount));
+	WorkerThreadPool& WorkerPool = GetSmallWorkerPool();
 
 	std::unordered_set<IoHash, IoHash::Hasher> Attachments;
 	std::vector<std::vector<IoHash>>		   ChunksInBlocks;
diff --git a/src/zenserver/sentryintegration.cpp b/src/zenserver/sentryintegration.cpp
index 755fe97db..11bf78a75 100644
--- a/src/zenserver/sentryintegration.cpp
+++ b/src/zenserver/sentryintegration.cpp
@@ -231,14 +231,25 @@ SentryIntegration::Initialize(std::string SentryDatabasePath, std::string Sentry
 		if (m_AllowPII)
 		{
 #	if ZEN_PLATFORM_WINDOWS
-			CHAR  UserNameBuffer[511 + 1];
-			DWORD UserNameLength = sizeof(UserNameBuffer) / sizeof(CHAR);
-			BOOL  OK			 = GetUserNameA(UserNameBuffer, &UserNameLength);
-			if (OK && UserNameLength)
+			CHAR  Buffer[511 + 1];
+			DWORD BufferLength = sizeof(Buffer) / sizeof(CHAR);
+			BOOL  OK		   = GetUserNameA(Buffer, &BufferLength);
+			if (OK && BufferLength)
 			{
-				m_SentryUserName = std::string(UserNameBuffer, UserNameLength - 1);
+				m_SentryUserName = std::string(Buffer, BufferLength - 1);
+			}
+			BufferLength = sizeof(Buffer) / sizeof(CHAR);
+			OK			 = GetComputerNameA(Buffer, &BufferLength);
+			if (OK && BufferLength)
+			{
+				m_SentryHostName = std::string(Buffer, BufferLength);
+			}
+			else
+			{
+				m_SentryHostName = "unknown";
 			}
 #	endif	// ZEN_PLATFORM_WINDOWS
+
 #	if (ZEN_PLATFORM_LINUX || ZEN_PLATFORM_MAC)
 			uid_t		   uid = geteuid();
 			struct passwd* pw  = getpwuid(uid);
@@ -246,9 +257,24 @@ SentryIntegration::Initialize(std::string SentryDatabasePath, std::string Sentry
 			{
 				m_SentryUserName = std::string(pw->pw_name);
 			}
+			else
+			{
+				m_SentryUserName = "unknown";
+			}
+			char HostNameBuffer[1023 + 1];
+			int	 err = gethostname(HostNameBuffer, sizeof(HostNameBuffer));
+			if (err == 0)
+			{
+				m_SentryHostName = std::string(HostNameBuffer);
+			}
+			else
+			{
+				m_SentryHostName = "unknown";
+			}
 #	endif
+			m_SentryId						= fmt::format("{}@{}", m_SentryUserName, m_SentryHostName);
 			sentry_value_t SentryUserObject = sentry_value_new_object();
-			sentry_value_set_by_key(SentryUserObject, "id", sentry_value_new_string(m_SentryUserName.c_str()));
+			sentry_value_set_by_key(SentryUserObject, "id", sentry_value_new_string(m_SentryId.c_str()));
 			sentry_value_set_by_key(SentryUserObject, "username", sentry_value_new_string(m_SentryUserName.c_str()));
 			sentry_value_set_by_key(SentryUserObject, "ip_address", sentry_value_new_string("{{auto}}"));
 			sentry_set_user(SentryUserObject);
@@ -266,13 +292,29 @@ SentryIntegration::Initialize(std::string SentryDatabasePath, std::string Sentry
 void
 SentryIntegration::LogStartupInformation()
 {
+#	if (ZEN_PLATFORM_LINUX || ZEN_PLATFORM_MAC)
+	uid_t		   uid = geteuid();
+	struct passwd* pw  = getpwuid(uid);
+	if (pw)
+	{
+		m_SentryUserName = std::string(pw->pw_name);
+	}
+	ZEN_INFO("Username: '{}'", m_SentryUserName);
+
+	char HostNameBuffer[1023 + 1];
+	int	 err = gethostname(HostNameBuffer, sizeof(HostNameBuffer));
+	if (err == 0)
+	{
+		ZEN_INFO("Hostname: '{}'", HostNameBuffer);
+	}
+#	endif
 	if (m_IsInitialized)
 	{
 		if (m_SentryErrorCode == 0)
 		{
 			if (m_AllowPII)
 			{
-				ZEN_INFO("sentry initialized, username: '{}'", m_SentryUserName);
+				ZEN_INFO("sentry initialized, username: '{}', hostname: '{}', id: '{}'", m_SentryUserName, m_SentryHostName, m_SentryId);
 			}
 			else
 			{
diff --git a/src/zenserver/sentryintegration.h b/src/zenserver/sentryintegration.h
index fddba8882..dd8b87ab7 100644
--- a/src/zenserver/sentryintegration.h
+++ b/src/zenserver/sentryintegration.h
@@ -46,6 +46,8 @@ private:
 	bool									  m_AllowPII		= false;
 	std::unique_ptr<sentry::SentryAssertImpl> m_SentryAssert;
 	std::string								  m_SentryUserName;
+	std::string								  m_SentryHostName;
+	std::string								  m_SentryId;
 	std::shared_ptr<spdlog::logger>			  m_SentryLogger;
 };
 
diff --git a/src/zenserver/xmake.lua b/src/zenserver/xmake.lua
index 127213ebd..c42f305ee 100644
--- a/src/zenserver/xmake.lua
+++ b/src/zenserver/xmake.lua
@@ -9,7 +9,9 @@ target("zenserver")
              "zenutil",
              "zenvfs")
     add_headerfiles("**.h")
+    add_rules("utils.bin2c", {extensions = {".zip"}})
     add_files("**.cpp")
+    add_files("frontend/*.zip")
     add_files("zenserver.cpp", {unity_ignored  = true })
     add_includedirs(".")
     set_symbols("debug")
diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index 7111900ec..336f715f4 100644
--- a/src/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
@@ -24,6 +24,7 @@
 #include <zenstore/cidstore.h>
 #include <zenstore/scrubcontext.h>
 #include <zenutil/basicfile.h>
+#include <zenutil/workerpools.h>
 #include <zenutil/zenserverprocess.h>
 
 #if ZEN_PLATFORM_WINDOWS
@@ -117,7 +118,9 @@ ZenServer::Initialize(const ZenServerOptions& ServerOptions, ZenServerState::Zen
 	m_UseSentry				 = ServerOptions.NoSentry == false;
 	m_ServerEntry			 = ServerEntry;
 	m_DebugOptionForcedCrash = ServerOptions.ShouldCrash;
+	m_IsPowerCycle			 = ServerOptions.IsPowerCycle;
 	const int ParentPid		 = ServerOptions.OwnerPid;
+	m_StartupScrubOptions	 = ServerOptions.ScrubOptions;
 
 	if (ParentPid)
 	{
@@ -160,7 +163,7 @@ ZenServer::Initialize(const ZenServerOptions& ServerOptions, ZenServerState::Zen
 	// Ok so now we're configured, let's kick things off
 
 	m_Http				  = CreateHttpServer(ServerOptions.HttpServerConfig);
-	int EffectiveBasePort = m_Http->Initialize(ServerOptions.BasePort);
+	int EffectiveBasePort = m_Http->Initialize(ServerOptions.BasePort, ServerOptions.DataDir);
 
 	// Setup authentication manager
 	{
@@ -253,7 +256,6 @@ ZenServer::Initialize(const ZenServerOptions& ServerOptions, ZenServerState::Zen
 	{
 		ObjectStoreConfig ObjCfg;
 		ObjCfg.RootDirectory = m_DataRoot / "obj";
-		ObjCfg.ServerPort	 = static_cast<uint16_t>(EffectiveBasePort);
 
 		for (const auto& Bucket : ServerOptions.ObjectStoreConfig.Buckets)
 		{
@@ -289,7 +291,9 @@ ZenServer::Initialize(const ZenServerOptions& ServerOptions, ZenServerState::Zen
 							   .DiskSizeSoftLimit		= ServerOptions.GcConfig.DiskSizeSoftLimit,
 							   .MinimumFreeDiskSpaceToAllowWrites = ServerOptions.GcConfig.MinimumFreeDiskSpaceToAllowWrites,
 							   .LightweightInterval				  = std::chrono::seconds(ServerOptions.GcConfig.LightweightIntervalSeconds),
-							   .UseGCVersion					  = ServerOptions.GcConfig.UseGCV2 ? GcVersion::kV2 : GcVersion::kV1};
+							   .UseGCVersion					  = ServerOptions.GcConfig.UseGCV2 ? GcVersion::kV2 : GcVersion::kV1,
+							   .CompactBlockUsageThresholdPercent = ServerOptions.GcConfig.CompactBlockUsageThresholdPercent,
+							   .Verbose							  = ServerOptions.GcConfig.Verbose};
 	m_GcScheduler.Initialize(GcConfig);
 
 	// Create and register admin interface last to make sure all is properly initialized
@@ -364,9 +368,24 @@ ZenServer::InitializeState(const ZenServerOptions& ServerOptions)
 
 				if (ManifestVersion != ZEN_CFG_SCHEMA_VERSION)
 				{
-					WipeState = true;
-					WipeReason =
-						fmt::format("Manifest schema version: {}, differs from required: {}", ManifestVersion, ZEN_CFG_SCHEMA_VERSION);
+					std::filesystem::path ManifestSkipSchemaChangePath = m_DataRoot / "root_manifest.ignore_schema_mismatch";
+					if (ManifestVersion != 0 && std::filesystem::is_regular_file(ManifestSkipSchemaChangePath))
+					{
+						ZEN_INFO(
+							"Schema version {} found in '{}' does not match {}, ignoring mismatch due to existance of '{}' and updating "
+							"schema version",
+							ManifestVersion,
+							ManifestPath,
+							ZEN_CFG_SCHEMA_VERSION,
+							ManifestSkipSchemaChangePath);
+						UpdateManifest = true;
+					}
+					else
+					{
+						WipeState = true;
+						WipeReason =
+							fmt::format("Manifest schema version: {}, differs from required: {}", ManifestVersion, ZEN_CFG_SCHEMA_VERSION);
+					}
 				}
 			}
 		}
@@ -473,7 +492,7 @@ ZenServer::InitializeStructuredCache(const ZenServerOptions& ServerOptions)
 						const asio::error_code Err = utils::ResolveHostname(m_IoContext, Dns, "8558"sv, ZenUrls);
 						if (Err)
 						{
-							ZEN_ERROR("resolve FAILED, reason '{}'", Err.message());
+							ZEN_ERROR("resolve of '{}' FAILED, reason '{}'", Dns, Err.message());
 						}
 					}
 				}
@@ -536,10 +555,6 @@ ZenServer::InitializeStructuredCache(const ZenServerOptions& ServerOptions)
 void
 ZenServer::Run()
 {
-	// This is disabled for now, awaiting better scheduling
-	//
-	// ScrubStorage();
-
 	if (m_ProcessMonitor.IsActive())
 	{
 		CheckOwnerPid();
@@ -547,12 +562,13 @@ ZenServer::Run()
 
 	if (!m_TestMode)
 	{
-		ZEN_INFO("__________                _________ __                        ");
-		ZEN_INFO("\\____    /____   ____    /   _____//  |_  ___________   ____  ");
-		ZEN_INFO("  /     // __ \\ /    \\   \\_____  \\\\   __\\/  _ \\_  __ \\_/ __ \\ ");
-		ZEN_INFO(" /     /\\  ___/|   |  \\  /        \\|  | (  <_> )  | \\/\\  ___/ ");
-		ZEN_INFO("/_______ \\___  >___|  / /_______  /|__|  \\____/|__|    \\___  >");
-		ZEN_INFO("        \\/   \\/     \\/          \\/                         \\/ ");
+		ZEN_INFO(
+			"__________                _________ __                        \n"
+			"\\____    /____   ____    /   _____//  |_  ___________   ____  \n"
+			"  /     // __ \\ /    \\   \\_____  \\\\   __\\/  _ \\_  __ \\_/ __ \\ \n"
+			" /     /\\  ___/|   |  \\  /        \\|  | (  <_> )  | \\/\\  ___/ \n"
+			"/_______ \\___  >___|  / /_______  /|__|  \\____/|__|    \\___  >\n"
+			"        \\/   \\/     \\/          \\/                         \\/ \n");
 	}
 
 	ZEN_INFO(ZEN_APP_NAME " now running (pid: {})", GetCurrentProcessId());
@@ -575,13 +591,81 @@ ZenServer::Run()
 
 	OnReady();
 
+	if (!m_StartupScrubOptions.empty())
+	{
+		using namespace std::literals;
+
+		ZEN_INFO("triggering scrub with settings: '{}'", m_StartupScrubOptions);
+
+		bool							DoScrub = true;
+		bool							DoWait	= false;
+		GcScheduler::TriggerScrubParams ScrubParams;
+
+		ForEachStrTok(m_StartupScrubOptions, ',', [&](std::string_view Token) {
+			if (Token == "nocas"sv)
+			{
+				ScrubParams.SkipCas = true;
+			}
+			else if (Token == "nodelete"sv)
+			{
+				ScrubParams.SkipDelete = true;
+			}
+			else if (Token == "nogc"sv)
+			{
+				ScrubParams.SkipGc = true;
+			}
+			else if (Token == "no"sv)
+			{
+				DoScrub = false;
+			}
+			else if (Token == "wait"sv)
+			{
+				DoWait = true;
+			}
+			return true;
+		});
+
+		if (DoScrub)
+		{
+			m_GcScheduler.TriggerScrub(ScrubParams);
+
+			if (DoWait)
+			{
+				auto State = m_GcScheduler.Status();
+
+				while ((State != GcSchedulerStatus::kRunning) && (State != GcSchedulerStatus::kStopped))
+				{
+					Sleep(500);
+
+					State = m_GcScheduler.Status();
+				}
+
+				ZEN_INFO("waiting for Scrub/GC to complete...");
+
+				while (State == GcSchedulerStatus::kRunning)
+				{
+					Sleep(500);
+
+					State = m_GcScheduler.Status();
+				}
+
+				ZEN_INFO("Scrub/GC completed");
+			}
+		}
+	}
+
+	if (m_IsPowerCycle)
+	{
+		ZEN_INFO("Power cycle mode enabled -- shutting down");
+
+		RequestExit(0);
+	}
+
 	m_Http->Run(IsInteractiveMode);
 
 	SetNewState(kShuttingDown);
 
 	ZEN_INFO(ZEN_APP_NAME " exiting");
-
-	Flush();
 }
 
 void
@@ -616,8 +700,12 @@ ZenServer::Cleanup()
 		}
 
 		m_StatsReporter.Shutdown();
-
 		m_GcScheduler.Shutdown();
+
+		Flush();
+
+		ShutdownWorkerPools();
+
 		m_AdminService.reset();
 		m_VfsService.reset();
 		m_ObjStoreService.reset();
@@ -720,7 +808,7 @@ ZenServer::CheckSigInt()
 {
 	if (utils::SignalCounter[SIGINT] > 0)
 	{
-		ZEN_INFO("SIGINT triggered (Ctrl+C), exiting");
+		ZEN_INFO("SIGINT triggered (Ctrl+C) for process {}, exiting", zen::GetCurrentProcessId());
 		RequestExit(128 + SIGINT);
 		return;
 	}
@@ -768,7 +856,7 @@ ZenServer::ScrubStorage()
 	Stopwatch Timer;
 	ZEN_INFO("Storage validation STARTING");
 
-	WorkerThreadPool ThreadPool{1};
+	WorkerThreadPool ThreadPool{1, "Scrub"};
 	ScrubContext	 Ctx{ThreadPool};
 	m_CidStore->ScrubStorage(Ctx);
 	m_ProjectStore->ScrubStorage(Ctx);
diff --git a/src/zenserver/zenserver.h b/src/zenserver/zenserver.h
index 7da536708..1afd70b3e 100644
--- a/src/zenserver/zenserver.h
+++ b/src/zenserver/zenserver.h
@@ -36,7 +36,7 @@ ZEN_THIRD_PARTY_INCLUDES_END
 #include "vfs/vfsservice.h"
 
 #ifndef ZEN_APP_NAME
-#	define ZEN_APP_NAME "Zen store"
+#	define ZEN_APP_NAME "Unreal Zen Storage Server"
 #endif
 
 namespace zen {
@@ -88,6 +88,7 @@ private:
 	ZenServerState::ZenServerEntry* m_ServerEntry	  = nullptr;
 	bool							m_IsDedicatedMode = false;
 	bool							m_TestMode		  = false;
+	bool							m_IsPowerCycle	  = false;
 	CbObject						m_RootManifest;
 	std::filesystem::path			m_DataRoot;
 	std::filesystem::path			m_ContentRoot;
@@ -138,6 +139,8 @@ private:
 
 	bool m_DebugOptionForcedCrash = false;
 	bool m_UseSentry			  = false;
+
+	std::string m_StartupScrubOptions;
 };
 
 }  // namespace zen
diff --git a/src/zenserver/zenserver.rc b/src/zenserver/zenserver.rc
index 6d31e2c6e..e0003ea8f 100644
--- a/src/zenserver/zenserver.rc
+++ b/src/zenserver/zenserver.rc
@@ -90,11 +90,11 @@ PRODUCTVERSION ZEN_CFG_VERSION_MAJOR,ZEN_CFG_VERSION_MINOR,ZEN_CFG_VERSION_ALTER
         BLOCK "040904b0"
         {
             VALUE "CompanyName",        "Epic Games Inc\0"
-            VALUE "FileDescription",    "Local Storage Service for Unreal Engine\0"
+            VALUE "FileDescription",    "Unreal Zen Storage Service\0"
             VALUE "FileVersion",        ZEN_CFG_VERSION "\0"
             VALUE "LegalCopyright",     "Copyright Epic Games Inc. All Rights Reserved\0"
             VALUE "OriginalFilename",   "zenserver.exe\0"
-            VALUE "ProductName",        "Zen Storage Server\0"
+            VALUE "ProductName",        "Unreal Zen Storage Server\0"
 			VALUE "ProductVersion",		ZEN_CFG_VERSION_BUILD_STRING_FULL "\0"
         }
     }