diff --git a/tool/gocross/gocross-wrapper.sh b/tool/gocross/gocross-wrapper.sh
index 90f308eb5..e9fca2aea 100755
--- a/tool/gocross/gocross-wrapper.sh
+++ b/tool/gocross/gocross-wrapper.sh
@@ -74,6 +74,7 @@ case "$REV" in
             echo "# Cleaning up old Go toolchain $hash" >&2
             rm -rf "$HOME/.cache/tsgo/$hash"
             rm -rf "$HOME/.cache/tsgo/$hash.extracted"
+            rm -rf "$HOME/.cache/tsgoroot/$hash"
         done
     fi
     ;;
diff --git a/tool/gocross/toolchain.go b/tool/gocross/toolchain.go
index e701662f5..f422e289e 100644
--- a/tool/gocross/toolchain.go
+++ b/tool/gocross/toolchain.go
@@ -62,7 +62,7 @@ func getToolchain() (toolchainDir, gorootDir string, err error) {
 
 	cache := filepath.Join(os.Getenv("HOME"), ".cache")
 	toolchainDir = filepath.Join(cache, "tsgo", rev)
-	gorootDir = filepath.Join(toolchainDir, "gocross-goroot")
+	gorootDir = filepath.Join(cache, "tsgoroot", rev)
 
 	// You might wonder why getting the toolchain also provisions and returns a
 	// path suitable for use as GOROOT. Wonder no longer!