diff --git a/common/environment/build-style/go.sh b/common/environment/build-style/go.sh
index b13a99143ec..040b4894ad4 100644
--- a/common/environment/build-style/go.sh
+++ b/common/environment/build-style/go.sh
@@ -17,3 +17,4 @@ export CGO_CPPFLAGS="$CPPFLAGS"
 export CGO_CXXFLAGS="$CXXFLAGS"
 export CGO_LDFLAGS="$LDFLAGS"
 export CGO_ENABLED=1
+export GOCACHE="${XBPS_HOSTDIR}/gocache"
diff --git a/common/xbps-src/shutils/pkgtarget.sh b/common/xbps-src/shutils/pkgtarget.sh
index 559f2094c1a..1c20a717d04 100644
--- a/common/xbps-src/shutils/pkgtarget.sh
+++ b/common/xbps-src/shutils/pkgtarget.sh
@@ -63,6 +63,7 @@ remove_pkg_autodeps() {
 remove_pkg_wrksrc() {
     if [ -d "$wrksrc" ]; then
         msg_normal "$pkgver: cleaning build directory...\n"
+        chmod -R +wX $wrksrc # Needed to delete Go Modules
         rm -rf $wrksrc
     fi
 }
diff --git a/xbps-src b/xbps-src
index e27e9361a70..c84c60c6b44 100755
--- a/xbps-src
+++ b/xbps-src
@@ -621,10 +621,6 @@ else
         export CCACHE_COMPILERCHECK=content CCACHE_COMPRESS=1
         export PATH="$CCACHEPATH:$PATH"
         mkdir -p $CCACHE_DIR
-
-        export GOCACHE="${XBPS_HOSTDIR}/gocache"
-    else
-        export GOCACHE=off
     fi
     if [ -n "$XBPS_DISTCC" ]; then
         if [ -n "$XBPS_CCACHE" ]; then
@@ -688,6 +684,7 @@ case "$XBPS_TARGET" in
                 remove_pkg_autodeps
             fi
             msg_normal "xbps-src: cleaning up masterdir...\n"
+            chmod -R +wX $XBPS_MASTERDIR/builddir # Needed to remove Go Modules
             rm -rf $XBPS_MASTERDIR/builddir $XBPS_MASTERDIR/destdir
             rm -f $XBPS_MASTERDIR/tmp/* >/dev/null 2>&1
         else