diff --git a/.github/workflows/ci-unit-tests.yml b/.github/workflows/ci-unit-tests.yml
index a1654ffec94..86074e4ea50 100644
--- a/.github/workflows/ci-unit-tests.yml
+++ b/.github/workflows/ci-unit-tests.yml
@@ -26,9 +26,10 @@ jobs:
 
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
 
-    - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
+    - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
       with:
         go-version: 1.21.x
+        cache-dependency-path: ./go.sum
 
     - name: Run unit tests
       run: make test-ci
diff --git a/Makefile b/Makefile
index ee5974ba8b2..d70116097d9 100644
--- a/Makefile
+++ b/Makefile
@@ -53,9 +53,8 @@ else
 endif
 GOOS ?= $(shell $(GO) env GOOS)
 GOARCH ?= $(shell $(GO) env GOARCH)
-GOCACHE=$(abspath .gocache)
-GOBUILD=GOCACHE=$(GOCACHE) CGO_ENABLED=0 installsuffix=cgo $(GO) build -trimpath
-GOTEST_QUIET=GOCACHE=$(GOCACHE) $(GO) test $(RACE)
+GOBUILD=CGO_ENABLED=0 installsuffix=cgo $(GO) build -trimpath
+GOTEST_QUIET=$(GO) test $(RACE)
 GOTEST=$(GOTEST_QUIET) -v
 GOFMT=gofmt
 GOFUMPT=gofumpt