diff --git a/packages/aerc/build.sh b/packages/aerc/build.sh
index 5756b2f37..b989b12ee 100644
--- a/packages/aerc/build.sh
+++ b/packages/aerc/build.sh
@@ -10,4 +10,5 @@ TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_pre_configure() {
 	termux_setup_golang
+	termux_go_get
 }
diff --git a/packages/age/build.sh b/packages/age/build.sh
index 91fceb56f..1756e8b21 100644
--- a/packages/age/build.sh
+++ b/packages/age/build.sh
@@ -5,12 +5,11 @@ TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.0.0-rc.3
 TERMUX_PKG_SRCURL=https://github.com/FiloSottile/age/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=e352d8b4e08e0b493adf7ab3ea15b349fe07ab833d20395012aa516ea0c36708
+TERMUX_PKG_BUILD_IN_SRC="true"
 
 termux_step_make() {
 	termux_setup_golang
-	export GOPATH=$TERMUX_PKG_BUILDDIR
-
-	cd $TERMUX_PKG_SRCDIR
+	termux_go_get
 	go build ./cmd/age
 	go build ./cmd/age-keygen
 }
diff --git a/packages/antibody/build.sh b/packages/antibody/build.sh
index 84aefb12f..a577c7c6b 100644
--- a/packages/antibody/build.sh
+++ b/packages/antibody/build.sh
@@ -14,6 +14,7 @@ termux_step_make() {
 	ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/getantibody/antibody
 
 	cd "$GOPATH"/src/github.com/getantibody/antibody
+	termux_go_get -d -v
 	go build
 }
 
diff --git a/packages/aptly/build.sh b/packages/aptly/build.sh
index 37b0d0f6f..3b6ef0791 100644
--- a/packages/aptly/build.sh
+++ b/packages/aptly/build.sh
@@ -17,6 +17,7 @@ termux_step_make() {
 
 	go mod init
 	go mod vendor
+	termux_go_get -d -v
 	make install VERSION=$TERMUX_PKG_VERSION
 }
 
diff --git a/packages/brook/build.sh b/packages/brook/build.sh
index d052333d3..0e144c544 100644
--- a/packages/brook/build.sh
+++ b/packages/brook/build.sh
@@ -16,7 +16,7 @@ termux_step_make() {
 	mkdir -p "$TERMUX_PREFIX"/share/doc/brook
 	cp -a "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/txthinking/brook
 	cd "$GOPATH"/src/github.com/txthinking/brook/cli/brook
-	go get -d -v
+	termux_go_get -d -v
 	go build -o brook 
 }
 
diff --git a/packages/caddy/build.sh b/packages/caddy/build.sh
index 3cef6a373..fa5990016 100644
--- a/packages/caddy/build.sh
+++ b/packages/caddy/build.sh
@@ -15,6 +15,7 @@ termux_step_make() {
 
 	cd $GOPATH/src/github.com/caddyserver/caddy/cmd/caddy
 	export GO111MODULE=on
+	termux_go_get -d -v
 	go build -v .
 }
 
diff --git a/packages/chezmoi/build.sh b/packages/chezmoi/build.sh
index 1b3751c9f..0d57f6705 100644
--- a/packages/chezmoi/build.sh
+++ b/packages/chezmoi/build.sh
@@ -15,7 +15,7 @@ termux_step_make() {
 	cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/twpayne/chezmoi"
 	cd "${TERMUX_PKG_BUILDDIR}/src/github.com/twpayne/chezmoi"
 
-	go get -d -v
+	termux_go_get -d -v
 	go build -tags noupgrade,noembeddocs \
 		-ldflags "-X github.com/twpayne/chezmoi/cmd.DocsDir=$TERMUX_PREFIX/share/doc/chezmoi -X main.version=${TERMUX_PKG_VERSION}" .
 }
diff --git a/packages/clash/build.sh b/packages/clash/build.sh
index 88abf9493..9acd469d8 100644
--- a/packages/clash/build.sh
+++ b/packages/clash/build.sh
@@ -12,7 +12,8 @@ termux_step_make() {
 
 	mkdir ./gopath
 	export GOPATH="$PWD/gopath"
-
+	
+	termux_go_get
 	GOBUILD=CGO_ENABLED=0 \
 		go build \
 			-trimpath \
diff --git a/packages/croc/build.sh b/packages/croc/build.sh
index 00f1f0c8b..2839d1b35 100644
--- a/packages/croc/build.sh
+++ b/packages/croc/build.sh
@@ -11,7 +11,7 @@ termux_step_make() {
 	cd $TERMUX_PKG_SRCDIR
 
 	termux_setup_golang
-
+	termux_go_get
 	go build -o croc -trimpath
 }
 
diff --git a/packages/delve/build.sh b/packages/delve/build.sh
index 2b120f252..dcc6f0e6c 100644
--- a/packages/delve/build.sh
+++ b/packages/delve/build.sh
@@ -16,7 +16,7 @@ termux_step_make() {
 	mkdir -p "$TERMUX_PREFIX"/share/doc/delve
 	cp -a "$TERMUX_PKG_SRCDIR" "$TERMUX_PKG_BUILDDIR"/src/github.com/go-delve/delve/
 	cd "$TERMUX_PKG_BUILDDIR"/src/github.com/go-delve/delve/cmd/dlv/
-	go get -d -v
+	termux_go_get -d -v
 	go build
 }
 
diff --git a/packages/direnv/build.sh b/packages/direnv/build.sh
index 8d1607df3..00164c945 100644
--- a/packages/direnv/build.sh
+++ b/packages/direnv/build.sh
@@ -9,6 +9,7 @@ TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_make() {
  	termux_setup_golang
+	termux_go_get
 	make
 }
 
diff --git a/packages/duf/build.sh b/packages/duf/build.sh
index d43a3d97b..0ef68b6f7 100644
--- a/packages/duf/build.sh
+++ b/packages/duf/build.sh
@@ -15,7 +15,7 @@ termux_step_make() {
         cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/muesli/duf"
         cd "${TERMUX_PKG_BUILDDIR}/src/github.com/muesli/duf"
 
-        go get -d -v
+        termux_go_get -d -v
         go build
 }
 
diff --git a/packages/elvish/build.sh b/packages/elvish/build.sh
index a6be92713..954563dde 100644
--- a/packages/elvish/build.sh
+++ b/packages/elvish/build.sh
@@ -14,6 +14,7 @@ termux_step_make() {
 	ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/elves/elvish
 
 	cd "$GOPATH"/src/github.com/elves/elvish
+	termux_go_get -d -v
 	go build
 }
 
diff --git a/packages/flyctl/build.sh b/packages/flyctl/build.sh
index 696a22632..21798f9a7 100644
--- a/packages/flyctl/build.sh
+++ b/packages/flyctl/build.sh
@@ -11,7 +11,7 @@ TERMUX_PKG_BLACKLISTED_ARCHES="i686, arm"
 termux_step_post_get_source() {
 	termux_setup_golang
 	export GOPATH=$TERMUX_PKG_SRCDIR/go
-	go get
+	termux_go_get
 	chmod 777 $GOPATH -R
 }
 
diff --git a/packages/fzf/build.sh b/packages/fzf/build.sh
index 6893e48d4..53905d71e 100644
--- a/packages/fzf/build.sh
+++ b/packages/fzf/build.sh
@@ -28,7 +28,7 @@ termux_step_make() {
 	TERMUX_PKG_SRCDIR=$GOPATH/src/github.com/junegunn/fzf
 
 	cd $GOPATH/src/github.com/junegunn/fzf
-	go get -d -v github.com/junegunn/fzf
+	termux_go_get -d -v github.com/junegunn/fzf
 	go build
 }
 
diff --git a/packages/germanium/build.sh b/packages/germanium/build.sh
index 0b65fa549..2868a0348 100644
--- a/packages/germanium/build.sh
+++ b/packages/germanium/build.sh
@@ -2,13 +2,14 @@ TERMUX_PKG_HOMEPAGE=https://github.com/matsuyoshi30/germanium
 TERMUX_PKG_DESCRIPTION="Generate image from source code"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="Raven Ravener <ravener.anime@gmail.com>"
-TERMUX_PKG_VERSION=1.1.0
+TERMUX_PKG_VERSION=1.2.0
 TERMUX_PKG_SRCURL=https://github.com/matsuyoshi30/germanium/archive/v$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=afd39dc311b0c5226a9a197c07b13d52c6fc2557543951f4ba98910c19824881
+TERMUX_PKG_SHA256=9a2b190ea7e8211ed03fa6860aea73ef06228266d7b6e4d32df2031fdf1c9606
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_make() {
 	termux_setup_golang
+	termux_go_get
 	make build
 }
  
diff --git a/packages/geth/build.sh b/packages/geth/build.sh
index c5dc07917..669b02735 100644
--- a/packages/geth/build.sh
+++ b/packages/geth/build.sh
@@ -14,6 +14,7 @@ termux_step_make() {
 	ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/ethereum/go-ethereum
 
 	cd "$GOPATH"/src/github.com/ethereum/go-ethereum
+	termux_go_get -d -v
 	for applet in geth abigen bootnode ethkey evm rlpdump puppeth; do
 		(cd ./cmd/"$applet" && go build -v)
 	done
diff --git a/packages/gh/build.sh b/packages/gh/build.sh
index 7a0551c99..0276237de 100755
--- a/packages/gh/build.sh
+++ b/packages/gh/build.sh
@@ -20,7 +20,7 @@ termux_step_make() {
 	mkdir -p "$TERMUX_PREFIX"/share/doc/gh
 	cp -a "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/cli/cli
 	cd "$GOPATH"/src/github.com/cli/cli/cmd/gh
-	go get -d -v
+	termux_go_get -d -v
 	go build -ldflags="-X github.com/cli/cli/internal/build.Version=$TERMUX_PKG_VERSION"
 }
 
diff --git a/packages/git-lfs/build.sh b/packages/git-lfs/build.sh
index 5acf7d742..bb09dfec1 100644
--- a/packages/git-lfs/build.sh
+++ b/packages/git-lfs/build.sh
@@ -15,6 +15,7 @@ termux_step_make() {
 
 	cd "$GOPATH"/github.com/git-lfs/git-lfs
 	! $TERMUX_ON_DEVICE_BUILD && GOOS=linux GOARCH=amd64 CC=gcc LD=gcc go generate github.com/git-lfs/git-lfs/commands
+	termux_go_get -d -v
 	go build git-lfs.go
 }
 
diff --git a/packages/gitea/build.sh b/packages/gitea/build.sh
index daefc0cff..08dd04e93 100644
--- a/packages/gitea/build.sh
+++ b/packages/gitea/build.sh
@@ -20,6 +20,7 @@ termux_step_make() {
 	LDFLAGS+=" -X code.gitea.io/gitea/modules/setting.CustomConf=$TERMUX_PREFIX/etc/gitea/app.ini"
 	LDFLAGS+=" -X code.gitea.io/gitea/modules/setting.AppWorkPath=$TERMUX_PREFIX/var/lib/gitea"
 	LDFLAGS+=" -X code.gitea.io/gitea/modules/setting.CustomPath=$TERMUX_PREFIX/var/lib/gitea"
+	termux_go_get -d -v
 	GITEA_VERSION=v"$TERMUX_PKG_VERSION" TAGS="bindata sqlite" make all
 }
 
diff --git a/packages/glow/build.sh b/packages/glow/build.sh
index 0b8a5f0bf..3ff33489d 100644
--- a/packages/glow/build.sh
+++ b/packages/glow/build.sh
@@ -16,7 +16,7 @@ termux_step_make() {
         cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/charmbracelet/glow"
         cd "${TERMUX_PKG_BUILDDIR}/src/github.com/charmbracelet/glow"
 
-        go get -d -v
+        termux_go_get -d -v
         go build
 }
 
diff --git a/packages/go-findimagedupes/build.sh b/packages/go-findimagedupes/build.sh
index 03bf6ca56..daaa06869 100644
--- a/packages/go-findimagedupes/build.sh
+++ b/packages/go-findimagedupes/build.sh
@@ -23,7 +23,8 @@ termux_step_make() {
 	ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/gitlab.com/opennota/findimagedupes
 
 	cd "$GOPATH"/src/gitlab.com/opennota/findimagedupes
-
+	
+	termux_go_get -d -v
 	go build .
 }
 
diff --git a/packages/gogs/build.sh b/packages/gogs/build.sh
index e1ed43b80..83d778421 100644
--- a/packages/gogs/build.sh
+++ b/packages/gogs/build.sh
@@ -15,7 +15,7 @@ termux_step_handle_hostbuild() {
 	export GOPATH=$TERMUX_PKG_HOSTBUILD_DIR
 	mkdir -p $TERMUX_PKG_HOSTBUILD_DIR
 	cd $TERMUX_PKG_HOSTBUILD_DIR
-	go get -u github.com/kevinburke/go-bindata/...
+	termux_go_get -u github.com/kevinburke/go-bindata/...
 }
 
 termux_step_make() {
@@ -30,7 +30,7 @@ termux_step_make() {
 	LDFLAGS+=" -X gogs.io/gogs/internal/conf.CustomConf=$TERMUX_PREFIX/etc/gogs/app.ini"
 	LDFLAGS+=" -X gogs.io/gogs/internal/conf.AppWorkPath=$TERMUX_PREFIX/var/lib/gogs"
 	LDFLAGS+=" -X gogs.io/gogs/internal/conf.CustomPath=$TERMUX_PREFIX/var/lib/gogs"
-
+	termux_go_get
 	PATH=$PATH:$TERMUX_PKG_HOSTBUILD_DIR/bin GOGS_VERSION=v"$TERMUX_PKG_VERSION" TAGS="bindata sqlite" make all
 }
 
diff --git a/packages/gopass/build.sh b/packages/gopass/build.sh
index ddb40724d..0ba25d1a0 100644
--- a/packages/gopass/build.sh
+++ b/packages/gopass/build.sh
@@ -18,6 +18,7 @@ termux_step_make() {
 
 	rm -f ./src/github.com/gopasspw/gopass/gopass
 	make -C ./src/github.com/gopasspw/gopass build CLIPHELPERS="-X github.com/gopasspw/gopass/pkg/clipboard.Helpers=termux-api'"
+	# TODO: Cache Go dependencies for on device builds
 	install -Dm700 \
 		./src/github.com/gopasspw/gopass/gopass \
 		"$TERMUX_PREFIX"/bin/gopass
diff --git a/packages/gotty/build.sh b/packages/gotty/build.sh
index 5b4070b06..f92a82c3a 100644
--- a/packages/gotty/build.sh
+++ b/packages/gotty/build.sh
@@ -17,6 +17,7 @@ termux_step_make() {
 	cd "$GOPATH"/src/github.com/yudai/gotty
 	go mod init || go mod download
 	#go mod tidy
+	termux_go_get -d -v
 	go build
 }
 
diff --git a/packages/helm/build.sh b/packages/helm/build.sh
index f05a9784b..7cd610334 100644
--- a/packages/helm/build.sh
+++ b/packages/helm/build.sh
@@ -12,6 +12,7 @@ termux_step_make() {
 	mkdir -p "${TERMUX_PKG_BUILDDIR}/src/github.com/helm"
 	cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/helm/helm"
 	cd "${TERMUX_PKG_BUILDDIR}/src/github.com/helm/helm"
+	# TODO: Cache Golang dependencies
 	make
 }
 
diff --git a/packages/hub/build.sh b/packages/hub/build.sh
index 5bdfa6cc8..9801007de 100644
--- a/packages/hub/build.sh
+++ b/packages/hub/build.sh
@@ -18,6 +18,7 @@ termux_step_host_build() {
 	cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/github/hub"
 
 	cd "${GOPATH}/src/github.com/github/hub"
+	termux_go_get -d -v
 	make man-pages
 }
 
@@ -30,6 +31,7 @@ termux_step_make_install() {
 	mkdir -p "${GOPATH}/src/github.com/github"
 	cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/github/hub"
 	cd "${GOPATH}/src/github.com/github/hub"
+	termux_go_get -d -v
 	make bin/hub "prefix=$TERMUX_PREFIX"
 	install -Dm700 ./bin/hub "$TERMUX_PREFIX"/bin/hub
 
diff --git a/packages/hugo/build.sh b/packages/hugo/build.sh
index 545a93134..e8cba0ae6 100644
--- a/packages/hugo/build.sh
+++ b/packages/hugo/build.sh
@@ -6,36 +6,36 @@ TERMUX_PKG_VERSION=0.85.0
 TERMUX_PKG_SRCURL=https://github.com/gohugoio/hugo/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
 TERMUX_PKG_DEPENDS="libc++"
+TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_make() {
 	termux_setup_golang
-	export GOPATH=$TERMUX_PKG_BUILDDIR
-
-	cd $TERMUX_PKG_SRCDIR
+	export GOPATH=$TERMUX_PKG_SRCDIR/go
+	termux_go_get
 	go build \
-		-o "$TERMUX_PREFIX/bin/hugo" \
-		-tags "linux extended" \
+		-o hugo \
 		main.go
-		# "linux" tag should not be necessary
-		# try removing when golang version is upgraded
-
-	# Building for host to generate manpages and completion.
-	chmod 700 -R $GOPATH/pkg && rm -rf $GOPATH/pkg
-	unset GOOS GOARCH CGO_LDFLAGS
-	unset CC CXX CFLAGS CXXFLAGS LDFLAGS
-	go build \
-		-o "$TERMUX_PKG_BUILDDIR/hugo" \
-		-tags "linux extended" \
-		main.go
-		# "linux" tag should not be necessary
-		# try removing when golang version is upgraded
+	if ! $TERMUX_ON_DEVICE_BUILD; then
+		chmod 700 -R $GOPATH/pkg && rm -rf $GOPATH/pkg
+		unset GOOS GOARCH CGO_LDFLAGS
+		unset CC CXX CFLAGS CXXFLAGS LDFLAGS
+		go build \
+			-o hugo-host \
+			main.go
+	fi
 }
 
 termux_step_make_install() {
+	if $TERMUX_ON_DEVICE_BUILD; then
+		export HUGO=$TERMUX_PKG_SRCDIR/hugo
+	else
+		export HUGO=$TERMUX_PKG_SRCDIR/hugo-host
+	fi
+	install -Dm700 -t "$TERMUX_PREFIX"/bin "$TERMUX_PKG_SRCDIR"/hugo
 	mkdir -p $TERMUX_PREFIX/share/{bash-completion/completions,man/man1}
 
-	$TERMUX_PKG_BUILDDIR/hugo gen autocomplete \
+	$HUGO gen autocomplete \
 		--completionfile=$TERMUX_PREFIX/share/bash-completion/completions/hugo
-	$TERMUX_PKG_BUILDDIR/hugo gen man \
+	$HUGO gen man \
 		--dir=$TERMUX_PREFIX/share/man/man1/
 }
diff --git a/packages/hydroxide/build.sh b/packages/hydroxide/build.sh
index 731cb9e8a..7369210de 100644
--- a/packages/hydroxide/build.sh
+++ b/packages/hydroxide/build.sh
@@ -12,6 +12,7 @@ termux_step_make() {
 	export GOPATH=$TERMUX_PKG_BUILDDIR
 
 	cd $TERMUX_PKG_SRCDIR
+	#TODO: Cache Golang dependencies
 	go build ./cmd/hydroxide
 }
 
diff --git a/packages/ipfs/build.sh b/packages/ipfs/build.sh
index 8c951085a..80499ea78 100644
--- a/packages/ipfs/build.sh
+++ b/packages/ipfs/build.sh
@@ -25,7 +25,8 @@ termux_step_make() {
 	mkdir -p "${GOPATH}/src/github.com/ipfs"
 	cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/ipfs/go-ipfs"
 	cd "${GOPATH}/src/github.com/ipfs/go-ipfs"
-
+	
+	termux_go_get -d -v
 	make build
 
 	# Fix folders without write permissions preventing which fails repeating builds:
diff --git a/packages/jfrog-cli/build.sh b/packages/jfrog-cli/build.sh
index 2bdcbc634..4b703b732 100644
--- a/packages/jfrog-cli/build.sh
+++ b/packages/jfrog-cli/build.sh
@@ -12,9 +12,9 @@ termux_step_make() {
 	export GOPATH=$TERMUX_PKG_BUILDDIR
 
 	cd $TERMUX_PKG_SRCDIR
+	termux_go_get
 	go build \
 		-o "$TERMUX_PREFIX/bin/jfrog" \
-		-tags "linux extended" \
 		main.go
 		# "linux" tag should not be necessary
 		# try removing when golang version is upgraded
@@ -25,7 +25,6 @@ termux_step_make() {
 	unset CC CXX CFLAGS CXXFLAGS LDFLAGS
 	go build \
 		-o "$TERMUX_PKG_BUILDDIR/jfrog" \
-		-tags "linux extended" \
 		main.go
 		# "linux" tag should not be necessary
 		# try removing when golang version is upgraded
diff --git a/packages/k9s/build.sh b/packages/k9s/build.sh
index 6bbbe4ee0..bff30edf3 100644
--- a/packages/k9s/build.sh
+++ b/packages/k9s/build.sh
@@ -13,7 +13,7 @@ termux_step_make() {
         cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/derailed/k9s"
         cd "${TERMUX_PKG_BUILDDIR}/src/github.com/derailed/k9s"
 
-        go get -d -v
+        termux_go_get -d -v
         go build
 }
 
diff --git a/packages/kubectl/build.sh b/packages/kubectl/build.sh
index b13d90468..d3a1f131c 100644
--- a/packages/kubectl/build.sh
+++ b/packages/kubectl/build.sh
@@ -34,6 +34,7 @@ termux_step_make() {
 	#rm -rf "$TERMUX_PKG_SRCDIR"/_output
 
 	cd "$TERMUX_PKG_SRCDIR"/cmd/kubectl
+	termux_go_get -d -v
 	go build .
 }
 
diff --git a/packages/lazygit/build.sh b/packages/lazygit/build.sh
index d97879ce4..904bc6ccf 100644
--- a/packages/lazygit/build.sh
+++ b/packages/lazygit/build.sh
@@ -16,7 +16,7 @@ termux_step_make() {
         cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/jesseduffield/lazygit"
         cd "${TERMUX_PKG_BUILDDIR}/src/github.com/jesseduffield/lazygit"
 
-        go get -d -v
+        termux_go_get -d -v
         go build
 }
 
diff --git a/packages/lf/build.sh b/packages/lf/build.sh
index 3fde8a909..1f6835050 100644
--- a/packages/lf/build.sh
+++ b/packages/lf/build.sh
@@ -13,6 +13,7 @@ termux_step_make() {
 	mkdir -p "$GOPATH/src/github.com/gokcehan"
 	ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH/src/github.com/gokcehan/lf"
 	cd "$GOPATH/src/github.com/gokcehan/lf"
+	termux_go_get -d -v
 	go build -ldflags="-X main.gVersion=r$TERMUX_PKG_VERSION" -trimpath
 }
 
diff --git a/packages/micro/build.sh b/packages/micro/build.sh
index cb88e3f7a..a5a3a7516 100644
--- a/packages/micro/build.sh
+++ b/packages/micro/build.sh
@@ -21,6 +21,7 @@ termux_step_make_install() {
 
 	cd $MICRO_SRC
 	make build-quick
+	# TODO: Cache Golamg dependencies
 	mv micro $TERMUX_PREFIX/bin/micro
 }
 
diff --git a/packages/o-editor/build.sh b/packages/o-editor/build.sh
index 5d90b0786..0a4639c3a 100644
--- a/packages/o-editor/build.sh
+++ b/packages/o-editor/build.sh
@@ -16,6 +16,7 @@ termux_step_make() {
 	ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/xyproto/o
 
 	cd "$GOPATH"/src/github.com/xyproto/o
+	termux_go_get -d -v
 	go build
 }
 
diff --git a/packages/obfs4proxy/build.sh b/packages/obfs4proxy/build.sh
index a800c2358..9b07f38d4 100644
--- a/packages/obfs4proxy/build.sh
+++ b/packages/obfs4proxy/build.sh
@@ -15,7 +15,7 @@ TERMUX_PKG_DEPENDS="tor"
 termux_step_make() {
 	termux_setup_golang
 	cd "$TERMUX_PKG_SRCDIR"/obfs4proxy
-	go get -d ./...
+	termux_go_get -d ./...
 	go build .
 }
 
diff --git a/packages/proton-bridge/build.sh b/packages/proton-bridge/build.sh
index bacca8721..91f35c455 100644
--- a/packages/proton-bridge/build.sh
+++ b/packages/proton-bridge/build.sh
@@ -6,12 +6,16 @@ TERMUX_PKG_SRCURL=https://github.com/ProtonMail/proton-bridge.git
 TERMUX_PKG_GIT_BRANCH=br-$TERMUX_PKG_VERSION
 TERMUX_PKG_MAINTAINER="Radomír Polách <rp@t4d.cz>"
 TERMUX_PKG_BLACKLISTED_ARCHES="arm, i686"
+TERMUX_PKG_BUILD_IN_SRC=true
+
+termux_step_make() {
+	termux_setup_golang
+	export GOPATH=$TERMUX_PKG_SRCDIR/go
+	go mod tidy
+	# TODO: Cache go dependencies `termux_go_deps` after new release of proton-bridge
+	make build-nogui
+}
 
 termux_step_make_install() {
-	termux_setup_golang
-	export GOPATH=$TERMUX_PKG_BUILDDIR
-	export BUILDDIR=$TERMUX_PREFIX/bin
-	cd $TERMUX_PKG_SRCDIR
-	make build-nogui
 	install -Dm700 proton-bridge "$TERMUX_PREFIX"/bin/proton-bridge
 }
diff --git a/packages/pup/build.sh b/packages/pup/build.sh
index 368058fa7..8d977f708 100644
--- a/packages/pup/build.sh
+++ b/packages/pup/build.sh
@@ -18,7 +18,7 @@ termux_step_make() {
 	cd "${GOPATH}/src/github.com/ericchiang/pup"
 	export GO111MODULE=off
 
-	go get -d -v
+	termux_go_get -d -v
 	go build
 }
 
diff --git a/packages/rclone/build.sh b/packages/rclone/build.sh
index 7e2f93b45..bdd7226a0 100644
--- a/packages/rclone/build.sh
+++ b/packages/rclone/build.sh
@@ -16,6 +16,7 @@ termux_step_make_install() {
 	ln -sf "$PWD" .gopath/src/github.com/rclone/rclone
 	export GOPATH="$PWD/.gopath"
 
+	termux_go_get
 	go build -v -ldflags "-X github.com/rclone/rclone/fs.Version=${TERMUX_PKG_VERSION}-termux" -tags noselfupdate -o rclone
 
 	# XXX: Fix read-only files which prevents removal of src dir.
diff --git a/packages/restic/build.sh b/packages/restic/build.sh
index 45fc204da..d8d6b6a3c 100644
--- a/packages/restic/build.sh
+++ b/packages/restic/build.sh
@@ -25,6 +25,7 @@ termux_step_make() {
 		rm -f ./restic
 	)
 
+	termux_go_get -d -v
 	go build -ldflags "-X 'main.version=${TERMUX_PKG_VERSION}'" ./cmd/...
 }
 
diff --git a/packages/rush/build.sh b/packages/rush/build.sh
index 1c62e800d..f98a62233 100644
--- a/packages/rush/build.sh
+++ b/packages/rush/build.sh
@@ -17,7 +17,7 @@ termux_step_make_install() {
 	cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/shenwei356/rush"
 	cd "${GOPATH}/src/github.com/shenwei356/rush"
 	go mod init rush
-	go get -d -v
+	termux_go_get -d -v
 	go install
 
 	install -Dm700 $TERMUX_PKG_BUILDDIR/bin/*/rush $TERMUX_PREFIX/bin/
diff --git a/packages/shell2http/build.sh b/packages/shell2http/build.sh
index ca5b3b878..e1a92a3e2 100644
--- a/packages/shell2http/build.sh
+++ b/packages/shell2http/build.sh
@@ -17,7 +17,7 @@ termux_step_make() {
 	cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/msoap/shell2http"
 	cd "${GOPATH}/src/github.com/msoap/shell2http"
 	go mod init
-	go get -d -v
+	termux_go_get -d -v
 	go build
 }
 
diff --git a/packages/shiori/build.sh b/packages/shiori/build.sh
index b7911a4e2..7503df2de 100644
--- a/packages/shiori/build.sh
+++ b/packages/shiori/build.sh
@@ -16,7 +16,7 @@ termux_step_make() {
 	mkdir -p "$TERMUX_PREFIX"/share/doc/shiori
 	cp -a "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/go-shiori/shiori
 	cd "$GOPATH"/src/github.com/go-shiori/shiori/
-	go get -d -v
+	termux_go_get -d -v
 	go build
 }
 
diff --git a/packages/slides/build.sh b/packages/slides/build.sh
index cfc84a8bb..d8274e30b 100644
--- a/packages/slides/build.sh
+++ b/packages/slides/build.sh
@@ -5,12 +5,11 @@ TERMUX_PKG_MAINTAINER="Yaksh Bariya <yakshbari4@gmail.com>"
 TERMUX_PKG_VERSION=0.4.1
 TERMUX_PKG_SRCURL=https://github.com/maaslalani/slides/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=f1c3494ec8d52ebb0351f1722d60ad4f4dd56b1f649130adfe59db8c9ffaeae2
+TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_make() {
 	termux_setup_golang
-
-	export GOPATH=$TERMUX_PKG_BUILDDIR
-	cd "$TERMUX_PKG_SRCDIR"
+	termux_go_get
 	make build
 }
 
diff --git a/packages/sops/build.sh b/packages/sops/build.sh
index dc19c67e8..f6899431b 100644
--- a/packages/sops/build.sh
+++ b/packages/sops/build.sh
@@ -13,7 +13,7 @@ termux_step_make_install() {
 	mkdir -p "${GOPATH}/src/go.mozilla.org"
 	cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/go.mozilla.org/sops"
 	cd "${GOPATH}/src/go.mozilla.org/sops" || return 9
-	go get -d -v
+	termux_go_get -d -v
 	make install
 
 	install -Dm700 "${GOPATH}/bin/"*/sops "${TERMUX_PREFIX}/bin/sops"
diff --git a/packages/syncthing/build.sh b/packages/syncthing/build.sh
index 62566c5c4..89fc2fbf7 100644
--- a/packages/syncthing/build.sh
+++ b/packages/syncthing/build.sh
@@ -27,7 +27,8 @@ termux_step_make(){
 	export GO_ARCH=$GOARCH
 	export _CC=$CC
 	unset GOOS GOARCH CC
-
+	
+	termux_go_get -d -v
 	# Now file structure is same as go get etc.
 	go build build.go
 	export CC=$_CC
diff --git a/packages/teleport-tsh/build.sh b/packages/teleport-tsh/build.sh
index 7f626c797..de92b1b55 100644
--- a/packages/teleport-tsh/build.sh
+++ b/packages/teleport-tsh/build.sh
@@ -2,8 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://github.com/gravitational/teleport
 TERMUX_PKG_DESCRIPTION="Secure Access for Developers that doesn't get in the way"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=5.1.2
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=6.2.7
 TERMUX_PKG_SKIP_SRC_EXTRACT=true
 
 termux_step_make_install() {
@@ -17,6 +16,6 @@ termux_step_make_install() {
 	cd teleport
 
 	git checkout "v$TERMUX_PKG_VERSION"
-
+	termux_go_get
 	make $BUILDDIR/tsh
 }
diff --git a/packages/tweego/build.sh b/packages/tweego/build.sh
index c39392db7..4c4e40ff1 100644
--- a/packages/tweego/build.sh
+++ b/packages/tweego/build.sh
@@ -15,7 +15,7 @@ termux_step_make() {
 	ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/tmedwards/tweego
 
 	cd "$GOPATH"/src/github.com/tmedwards/tweego
-	go get -d -v github.com/tmedwards/tweego
+	termux_go_get -d -v github.com/tmedwards/tweego
 	go build
 }
 
diff --git a/packages/vegeta/build.sh b/packages/vegeta/build.sh
index 79c9b0d8b..c717ed3d3 100644
--- a/packages/vegeta/build.sh
+++ b/packages/vegeta/build.sh
@@ -15,6 +15,7 @@ termux_step_make() {
 	ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/tsenart/vegeta
 
 	cd "$GOPATH"/src/github.com/tsenart/vegeta
+	termux_go_get -d -v
 	go build
 }
 
diff --git a/packages/virustotal-cli/build.sh b/packages/virustotal-cli/build.sh
index c6f10a593..544792c4b 100644
--- a/packages/virustotal-cli/build.sh
+++ b/packages/virustotal-cli/build.sh
@@ -17,6 +17,7 @@ termux_step_make() {
 
 	cd "$GOPATH"/src/github.com/VirusTotal/vt-cli
 
+	# TODO: Cache Golang dependencies
 	go build \
 		-ldflags "-X github.com/VirusTotal/vt-cli/cmd.Version=$TERMUX_PKG_VERSION" \
 		-o "$TERMUX_PREFIX"/bin/vt-cli \
diff --git a/packages/wuzz/build.sh b/packages/wuzz/build.sh
index 71790ef1f..0c25dc6b4 100644
--- a/packages/wuzz/build.sh
+++ b/packages/wuzz/build.sh
@@ -14,6 +14,7 @@ termux_step_make() {
 	ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/asciimoo/wuzz
 
 	cd "$GOPATH"/src/github.com/asciimoo/wuzz
+	termux_go_get -d -v
 	go build
 }
 
diff --git a/packages/youtubedr/build.sh b/packages/youtubedr/build.sh
index 03f4c704f..9d7ec14dd 100644
--- a/packages/youtubedr/build.sh
+++ b/packages/youtubedr/build.sh
@@ -14,7 +14,7 @@ termux_step_make() {
 	mkdir -p "${GOPATH}/src/github.com/kkdai/"
 	cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/kkdai/youtube"
 	cd "${GOPATH}/src/github.com/kkdai/youtube/"
-	go get -d -v
+	termux_go_get -d -v
 	cd cmd/youtubedr
 	go build .
 }
diff --git a/scripts/build/setup/termux_setup_golang.sh b/scripts/build/setup/termux_setup_golang.sh
index 79cb67967..a8ce2ec31 100644
--- a/scripts/build/setup/termux_setup_golang.sh
+++ b/scripts/build/setup/termux_setup_golang.sh
@@ -40,3 +40,22 @@ termux_setup_golang() {
 		export GOROOT="$TERMUX_PREFIX/lib/go"
 	fi
 }
+
+termux_go_get() {
+	if $TERMUX_ON_DEVICE_BUILD; then
+		if [ -z ${GOPATH+x} ]; then
+			if $TERMUX_PKG_BUILD_IN_SRC; then
+				export GOPATH=$TERMUX_PKG_SRCDIR/go
+			else
+				export GOPATH=$TERMUX_PKG_BUILDDIR/go
+			fi
+		fi
+		if [ -d $TERMUX_PKG_CACHEDIR/go ]; then
+			cp $TERMUX_PKG_CACHEDIR/go $GOPATH -r
+		fi
+		go get "$@"
+		cp $GOPATH $TERMUX_PKG_CACHEDIR/go -r
+	else
+		go get "$@"
+	fi
+}