1 files changed, 37 insertions, 0 deletions
diff --git a/zenserver/upstream/upstreamcache.cpp b/zenserver/upstream/upstreamcache.cpp
index 5e0f6a297..da0743f0a 100644
--- a/zenserver/upstream/upstreamcache.cpp
+++ b/zenserver/upstream/upstreamcache.cpp
@@ -177,6 +177,43 @@ namespace detail {
 				{
 					Result = Session.GetDerivedData(CacheKey.Bucket, CacheKey.Hash);
 				}
+				else if (Type == ZenContentType::kCompressedBinary)
+				{
+					Result = Session.GetRef(CacheKey.Bucket, CacheKey.Hash, ZenContentType::kCbObject);
+
+					if (Result.Success)
+					{
+						const CbValidateError ValidationResult = ValidateCompactBinary(Result.Response, CbValidateMode::All);
+						if (Result.Success = ValidationResult == CbValidateError::None; Result.Success)
+						{
+							CbObject CacheRecord = LoadCompactBinaryObject(Result.Response);
+							IoBuffer ContentBuffer;
+							int		 NumAttachments = 0;
+
+							CacheRecord.IterateAttachments(
+								[&Session, &Result, &ContentBuffer, &NumAttachments](CbFieldView AttachmentHash) {
+									CloudCacheResult AttachmentResult = Session.GetCompressedBlob(AttachmentHash.AsHash());
+									Result.Bytes += AttachmentResult.Bytes;
+									Result.ElapsedSeconds += AttachmentResult.ElapsedSeconds;
+									Result.ErrorCode = AttachmentResult.ErrorCode;
+
+									if (CompressedBuffer Chunk = CompressedBuffer::FromCompressed(SharedBuffer(AttachmentResult.Response)))
+									{
+										Result.Response = AttachmentResult.Response;
+										++NumAttachments;
+									}
+									else
+									{
+										Result.Success = false;
+									}
+								});
+							if (NumAttachments != 1)
+							{
+								Result.Success = false;
+							}
+						}
+					}
+				}
 				else
 				{
 					const ZenContentType AcceptType = Type == ZenContentType::kCbPackage ? ZenContentType::kCbObject : Type;