diff --git a/.buildkite-bazelrc b/.buildkite-bazelrc
index c7e45fe27..eca539e9e 100644
--- a/.buildkite-bazelrc
+++ b/.buildkite-bazelrc
@@ -43,3 +43,7 @@ build --flaky_test_attempts=5
 
 # Disable flaky test detection for fuzzing.
 test:fuzz --flaky_test_attempts=1
+
+# Better caching
+build:nostamp --nostamp
+build:nostamp --workspace_status_command=./hack/workspace_status_ci.sh
\ No newline at end of file
diff --git a/hack/workspace_status_ci.sh b/hack/workspace_status_ci.sh
new file mode 100755
index 000000000..79d6029d2
--- /dev/null
+++ b/hack/workspace_status_ci.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Note: The STABLE_ prefix will force a relink when the value changes when using rules_go x_defs.
+
+echo STABLE_GIT_COMMIT "continuous-integration"
+echo DATE "now"
+echo DATE_UNIX "0"
+echo DOCKER_TAG "ci-foo"
+echo STABLE_GIT_TAG "c1000deadbeef"