diff --git a/Dockerfile b/Dockerfile
index 1825ac9d9..b869b2e10 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,7 @@ ARG GOCACHE
 # layers when using COPY instructions for go.mod and go.sum.
 # https://docs.docker.com/build/guide/mounts/
 RUN --mount=type=cache,target=$GOPATH/pkg/mod \
+    --mount=type=cache,target=$GOCACHE \
     --mount=type=bind,source=go.sum,target=go.sum \
     --mount=type=bind,source=go.mod,target=go.mod \
     go mod download -x
@@ -41,6 +42,7 @@ RUN printf "Building for TARGETPLATFORM=${TARGETPLATFORM}" \
 # layers when using COPY instructions for go.mod and go.sum.
 # https://docs.docker.com/build/guide/mounts/
 RUN --mount=type=cache,target=$GOPATH/pkg/mod \
+    --mount=type=cache,target=$GOCACHE \
     --mount=type=bind,source=go.sum,target=go.sum \
     --mount=type=bind,source=go.mod,target=go.mod \
     CGO_ENABLED=0 GOOS=linux GOARCH="${TARGETARCH}" \
diff --git a/Makefile b/Makefile
index 954124049..ce6b56125 100644
--- a/Makefile
+++ b/Makefile
@@ -486,7 +486,8 @@ SKAFFOLD_RUN_PROFILE ?= dev
 
 .PHONY: _skaffold
 _skaffold: skaffold
-	$(SKAFFOLD) $(CMD) --port-forward=pods --profile=$(SKAFFOLD_PROFILE) $(SKAFFOLD_FLAGS)
+	GOCACHE=$(shell go env GOCACHE) \
+		$(SKAFFOLD) $(CMD) --port-forward=pods --profile=$(SKAFFOLD_PROFILE) $(SKAFFOLD_FLAGS)
 
 .PHONY: run.skaffold
 run.skaffold:
diff --git a/skaffold.yaml b/skaffold.yaml
index 8ad22b58e..83d65f8dd 100644
--- a/skaffold.yaml
+++ b/skaffold.yaml
@@ -36,6 +36,7 @@ profiles:
           TAG: "{{ .TAG }}"
           COMMIT: "{{ .COMMIT }}"
           REPO_INFO: "{{ .REPO_INFO }}"
+          GOCACHE: "{{ .GOCACHE }}"
 - name: dev
   manifests:
     kustomize:
@@ -57,6 +58,7 @@ profiles:
           TAG: "{{ .TAG }}"
           COMMIT: "{{ .COMMIT }}"
           REPO_INFO: "{{ .REPO_INFO }}"
+          GOCACHE: "{{ .GOCACHE }}"
 - name: debug
   manifests:
     kustomize:
@@ -78,3 +80,4 @@ profiles:
           TAG: "{{ .TAG }}"
           COMMIT: "{{ .COMMIT }}"
           REPO_INFO: "{{ .REPO_INFO }}"
+          GOCACHE: "{{ .GOCACHE }}"