2 files changed, 3 insertions, 6 deletions
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp
index 91da34ec..3cd9d4a8 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp
@@ -400,10 +400,7 @@ auto BazelCasClient::IncrementalReadSingleBlob(std::string const& instance_name,
 auto BazelCasClient::ReadSingleBlob(std::string const& instance_name,
                                     ArtifactDigest const& digest) const noexcept
     -> std::optional<ArtifactBlob> {
-    if (auto data = stream_->Read(instance_name, digest)) {
-        return ArtifactBlob{digest, std::move(*data), /*is_exec=*/false};
-    }
-    return std::nullopt;
+    return stream_->Read(instance_name, digest);
 }
 
 auto BazelCasClient::SplitBlob(HashFunction hash_function,
diff --git a/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp b/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp
index 213e4793..a85fa565 100644
--- a/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp
+++ b/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp
@@ -104,7 +104,7 @@ class ByteStreamClient {
 
     [[nodiscard]] auto Read(std::string const& instance_name,
                             ArtifactDigest const& digest) const noexcept
-        -> std::optional<std::string> {
+        -> std::optional<ArtifactBlob> {
         auto reader = IncrementalRead(instance_name, digest);
         std::string output{};
         auto data = reader.Next();
@@ -115,7 +115,7 @@ class ByteStreamClient {
         if (not data) {
             return std::nullopt;
         }
-        return output;
+        return ArtifactBlob{digest, std::move(output), /*is_exec=*/false};
     }
 
     [[nodiscard]] auto Write(std::string const& instance_name,