diff --git a/make/python-cli.mk b/make/python-cli.mk
index 541057c4..51e4ec49 100644
--- a/make/python-cli.mk
+++ b/make/python-cli.mk
@@ -9,7 +9,7 @@ clean:
 distclean:
 
 run:
-	python2 -m $(shell echo $(patsubst %.py,%,$(EXE)) | sed 's%^\./%%; s%/%.%g') $(EXE_ARGS)
+	$(PYTHON) -m $(shell echo $(patsubst %.py,%,$(EXE)) | sed 's%^\./%%; s%/%.%g') $(EXE_ARGS)
 
 pyc.clean:
 	find . -name '*.pyc' -print0 | xargs -r -0 $(RM) -f
diff --git a/make/topdir.mk b/make/topdir.mk
index 1b28c55b..18c68c22 100644
--- a/make/topdir.mk
+++ b/make/topdir.mk
@@ -161,7 +161,7 @@ git-update-project-description:
 	ssh git.janware.com "/opt/jw-build/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) update-descriptions $(PROJECT)"
 
 projects-%:
-	python2 $(JWB_SCRIPT_DIR)/projects.py build $* $(PROJECT)
+	$(PYTHON) $(JWB_SCRIPT_DIR)/projects.py build $* $(PROJECT)
 
 install-deps-devel:
 	sudo zypper in $(shell echo $(RPM_REQUIRES_DEVEL) | sed "s/ *= */-/g; s/ [^ ]\+-__NEXT_VERSION__//")
@@ -195,3 +195,7 @@ git-ssh: git-ssh-origin
 
 echo-hash:
 	@/bin/bash $(PKG_SH_EXE) hash
+
+recache-vars:
+	rm -f $(TOPDIR)/make/.cache.mk
+	make -C $(TOPDIR)/make .cache.mk