4 files changed, 14 insertions, 16 deletions
diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS
index 3bf03655..e7624d1d 100644
--- a/src/buildtool/execution_api/common/TARGETS
+++ b/src/buildtool/execution_api/common/TARGETS
@@ -65,12 +65,12 @@
     , ["src/buildtool/common", "config"]
     , ["src/buildtool/common/remote", "remote_common"]
     , ["src/buildtool/common/remote", "retry_config"]
-    , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/execution_api/local", "context"]
     , ["src/buildtool/execution_api/remote", "context"]
     ]
   , "private-deps":
-    [ ["src/buildtool/execution_api/bazel_msg", "execution_config"]
+    [ ["src/buildtool/crypto", "hash_function"]
+    , ["src/buildtool/execution_api/bazel_msg", "execution_config"]
     , ["src/buildtool/execution_api/local", "local_api"]
     , ["src/buildtool/execution_api/remote", "bazel_api"]
     , ["src/buildtool/execution_api/remote", "config"]
diff --git a/src/buildtool/execution_api/common/api_bundle.cpp b/src/buildtool/execution_api/common/api_bundle.cpp
index 69b628bc..7ab06e81 100644
--- a/src/buildtool/execution_api/common/api_bundle.cpp
+++ b/src/buildtool/execution_api/common/api_bundle.cpp
@@ -17,6 +17,7 @@
 #include <memory>
 #include <utility>
 
+#include "src/buildtool/crypto/hash_function.hpp"
 #include "src/buildtool/execution_api/bazel_msg/execution_config.hpp"
 #include "src/buildtool/execution_api/local/local_api.hpp"
 #include "src/buildtool/execution_api/remote/bazel/bazel_api.hpp"
@@ -29,23 +30,22 @@ auto ApiBundle::Create(
     gsl::not_null<LocalContext const*> const& local_context,
     gsl::not_null<RemoteContext const*> const& remote_context,
     RepositoryConfig const* repo_config) -> ApiBundle {
-    HashFunction const hash_fct = local_context->storage_config->hash_function;
     IExecutionApi::Ptr local_api =
         std::make_shared<LocalApi>(local_context, repo_config);
     IExecutionApi::Ptr remote_api = local_api;
     if (auto const address = remote_context->exec_config->remote_address) {
         ExecutionConfiguration config;
         config.skip_cache_lookup = false;
-        remote_api = std::make_shared<BazelApi>("remote-execution",
-                                                address->host,
-                                                address->port,
-                                                remote_context->auth,
-                                                remote_context->retry_config,
-                                                config,
-                                                hash_fct);
+        remote_api = std::make_shared<BazelApi>(
+            "remote-execution",
+            address->host,
+            address->port,
+            remote_context->auth,
+            remote_context->retry_config,
+            config,
+            local_context->storage_config->hash_function);
     }
-    return ApiBundle{.hash_function = hash_fct,
-                     .local = std::move(local_api),
+    return ApiBundle{.local = std::move(local_api),
                      .remote = std::move(remote_api)};
 }
 
@@ -63,7 +63,7 @@ auto ApiBundle::MakeRemote(
                                           authentication,
                                           retry_config,
                                           config,
-                                          hash_function);
+                                          HashFunction{local->GetHashType()});
     }
     return local;
 }
diff --git a/src/buildtool/execution_api/common/api_bundle.hpp b/src/buildtool/execution_api/common/api_bundle.hpp
index a08e7bba..75627ac7 100644
--- a/src/buildtool/execution_api/common/api_bundle.hpp
+++ b/src/buildtool/execution_api/common/api_bundle.hpp
@@ -22,7 +22,6 @@
 #include "src/buildtool/common/remote/remote_common.hpp"
 #include "src/buildtool/common/remote/retry_config.hpp"
 #include "src/buildtool/common/repository_config.hpp"
-#include "src/buildtool/crypto/hash_function.hpp"
 #include "src/buildtool/execution_api/common/execution_api.hpp"
 #include "src/buildtool/execution_api/local/context.hpp"
 #include "src/buildtool/execution_api/remote/context.hpp"
@@ -51,7 +50,6 @@ struct ApiBundle final {
         gsl::not_null<RetryConfig const*> const& retry_config) const
         -> gsl::not_null<IExecutionApi::Ptr>;
 
-    HashFunction const hash_function;
     gsl::not_null<IExecutionApi::Ptr> const local;
     gsl::not_null<IExecutionApi::Ptr> const remote;
 };
diff --git a/src/buildtool/execution_api/utils/subobject.cpp b/src/buildtool/execution_api/utils/subobject.cpp
index 106e8859..f1b1b459 100644
--- a/src/buildtool/execution_api/utils/subobject.cpp
+++ b/src/buildtool/execution_api/utils/subobject.cpp
@@ -52,7 +52,7 @@ auto RetrieveSubPathId(Artifact::ObjectInfo object_info,
                         sofar.string());
             return std::nullopt;
         }
-        if (not ProtocolTraits::IsNative(apis.hash_function.GetType())) {
+        if (not ProtocolTraits::IsNative(apis.remote->GetHashType())) {
             auto directory =
                 BazelMsgFactory::MessageFromString<bazel_re::Directory>(*data);
             if (not directory) {