diff --git a/.gitignore b/.gitignore
index 6336c5b8..3b34a6fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@ pkg-build.dist
 pkgconfig/
 rebase.sh
 __pycache__
+.cache-project.mk
+.cache-projects.mk
diff --git a/Makefile b/Makefile
index 4511fe1d..105c83d0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,24 @@
 TOPDIR                     = .
 PKG_UPLOAD_URLPREFIX      ?= rsync_ssh://$(JANWARE_USER)@pkg.janware.com:/srv/dav/pub/packages/jw-foss/$(PKG_UPLOAD_OS_NAME)/$(PKG_UPLOAD_OS_VERSION)
 
+all:
+all: cache-projects
+
 include $(TOPDIR)/make/proj.mk
 include $(JWBDIR)/make/topdir.mk
 include $(JWBDIR)/make/srcdist.mk
 include $(JWBDIR)/make/git-cvs-bridge.mk
 include $(JWBDIR)/make/py-topdir.mk
 
-all:
 clean: clean.pkgconfig
-
 clean.pkgconfig:
 	rm -rf pkgconfig
+
+# -- Cache for all projects
+cache-projects: $(CACHE_PROJECTS_MK)
+clean.cache-projects:
+	rm -f $(CACHE_PROJECTS_MK)
+topdir.clean: clean.cache-projects
+$(CACHE_PROJECTS_MK): $(CACHE_PROJECT_MK)
+	sed -E '/^[[:blank:]]*ifndef[[:blank:]]+($(subst $(space),|,$(CACHED_VARS_ONLY_PROJECT)))[[:blank:]]*$$/,/^[[:blank:]]*endif[[:blank:]]*$$/d' $< > $@.tmp
+	mv $@.tmp $@
diff --git a/make/Makefile b/make/Makefile
index 913d9978..f7497a62 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -13,19 +13,9 @@ endif
 
 include $(JWBDIR)/make/dev-utils.mk
 
-all: cache-projects
-clean: clean-cache-projects
-
 ifeq ($(TARGET),mingw)
 install: $(INSTALL_MAKEDIR)/winres.rc.tmpl
 endif
 
 grep-vars:
 	$(Q)sed '/^ *[A-Z]/!d; s/^[        ]*//g; s/[=+?:].*//g; s/[       ]*//g' *.mk | sort -u
-
-cache-projects: $(CACHE_PROJECTS_MK)
-clean-cache-projects:
-	rm -f $(CACHE_PROJECTS_MK)
-$(CACHE_PROJECTS_MK): $(CACHE_PROJECT_MK)
-	sed -E '/^[[:blank:]]*ifndef[[:blank:]]+($(subst $(space),|,$(CACHED_VARS_ONLY_PROJECT)))[[:blank:]]*$$/,/^[[:blank:]]*endif[[:blank:]]*$$/d' $< > $@.tmp
-	mv $@.tmp $@
diff --git a/make/cache.mk b/make/cache.mk
index 4c945942..ad46fb5d 100644
--- a/make/cache.mk
+++ b/make/cache.mk
@@ -1,9 +1,15 @@
 # ----- define these variables
 # CACHED_FILES     = $(TOPDIR)/VERSION
 # CACHED_VARS      = VERSION
-.PHONY: cache clean-cache clean-cache-projects
+.PHONY: cache clean.cache
+
+CACHED_FILES                ?= $(VERSION_FILE) $(wildcard $(TOPDIR)/make/project.conf)
+CACHED_VARS                 ?= PROJECT PREREQ_BUILD PREREQ_RUN PREREQ VERSION HEX_VERSION \
+				FULL_NAME WHICH PYTHON ECHO TEST BROWSER SED RM PWD ID CUT TR \
+				AWK GETENT XARGS FIND PRINTF PLATFORM_INFO OS_NAME_VERSION \
+				CAT BIN_INSTALL SUDO \
+				JW_PKG_LD_LIBRARY_PATH JW_PKG_EXE_PATH JW_PKG_PYTHON_PATH
 
-CACHE_PROJECT_MK            ?= .cache-project.mk
 CACHED_VARS_ONLY_PROJECT    ?= \
 	PROJECT \
 	PREREQ_BUILD \
@@ -15,9 +21,13 @@ CACHED_VARS_ONLY_PROJECT    ?= \
 	JW_PKG_LD_LIBRARY_PATH \
 	JW_PKG_EXE_PATH \
 	JW_PKG_PYTHON_PATH
+
+# We need this to cache JW_PKG_PYTHON_PATH
+include $(JWBDIR)/make/py-path.mk
+
 all: cache
-clean: clean-cache
-clean-cache:
+clean: clean.cache
+clean.cache:
 	rm -f $(CACHE_PROJECT_MK)
 
 cache: $(CACHE_PROJECT_MK)
diff --git a/make/make.mk b/make/make.mk
index f350d46b..d71ca4d8 100644
--- a/make/make.mk
+++ b/make/make.mk
@@ -8,15 +8,6 @@ include $(JWBDIR)/make/ldlibpath.mk
 include $(JWBDIR)/make/defs-dirs.mk
 include $(JWBDIR)/make/dev-utils.mk
 
-CACHED_FILES                ?= $(VERSION_FILE) $(wildcard $(TOPDIR)/make/project.conf)
-CACHED_VARS                 ?= PROJECT PREREQ_BUILD PREREQ_RUN PREREQ VERSION HEX_VERSION \
-				FULL_NAME WHICH PYTHON ECHO TEST BROWSER SED RM PWD ID CUT TR \
-				AWK GETENT XARGS FIND PRINTF PLATFORM_INFO OS_NAME_VERSION \
-				CAT BIN_INSTALL SUDO \
-				JW_PKG_LD_LIBRARY_PATH JW_PKG_EXE_PATH JW_PKG_PYTHON_PATH
-
-include $(JWBDIR)/make/cache.mk
-
 ifneq ($(CREATE_DEVEL),false)
   MKFILES                   += $(wildcard project.conf)
   DEVEL_TARGETS             += install_MAKE $(INSTALLED_PKG_MK)
diff --git a/make/pkg-dist.mk b/make/pkg-dist.mk
index e8b511ff..ab3ca837 100644
--- a/make/pkg-dist.mk
+++ b/make/pkg-dist.mk
@@ -128,7 +128,7 @@ pkg-update: pkgupdate.dist
 pkg-upload-local: pkg-upload-local.dist
 
 clean.rpm:
-	$(RM) -rf $(DIST_DIR) *.dist make/.cache-project.mk
+	$(RM) -rf $(DIST_DIR) *.dist
 
 pkg-build.dist: $(VERSION_FILE)
 	$(PKG_SH) build $(PKG_SH_BUILD_OPTS)
diff --git a/make/platform.mk b/make/platform.mk
index 2caad545..22d6846e 100644
--- a/make/platform.mk
+++ b/make/platform.mk
@@ -3,6 +3,16 @@
 ifndef PLATFORM_MK_INCLUDED
 PLATFORM_MK_INCLUDED         = true
 
+CACHE_PROJECT_MK            ?= $(TOPDIR)/.cache-project.mk
+CACHE_PROJECTS_MK           := $(JWBDIR)/.cache-projects.mk
+JW_PKG_NO_CACHE             ?= false
+
+ifneq ($(filter clean distclean,$(MAKECMDGOALS)),)
+  ifeq ($(TOPDIR),.)
+    JW_PKG_NO_CACHE          = true
+  endif
+endif
+
 # "-include" tries search path, we don't want that
 define try_include
   ifneq ($$(wildcard $(1)),)
@@ -10,12 +20,11 @@ define try_include
   endif
 endef
 
-CACHE_PROJECTS_MK           := $(JWBDIR)/cache-projects.mk
-
-ifeq ($(filter clean distclean,$(MAKECMDGOALS)),)
-$(eval $(call try_include,$(TOPDIR)/make/.cache-project.mk))
-$(eval $(call try_include,$(CACHE_PROJECTS_MK)))
+ifneq ($(JW_PKG_NO_CACHE),true)
+  $(eval $(call try_include,$(CACHE_PROJECT_MK)))
+  $(eval $(call try_include,$(CACHE_PROJECTS_MK)))
 endif
+
 $(eval $(call try_include,$(JWBDIR)/make/pre-local.mk))
 $(eval $(call try_include,$(TOPDIR)/make/pre-local.mk))
 $(eval $(call try_include,pre-local.mk))
diff --git a/make/topdir.mk b/make/topdir.mk
index 238b5837..0573e7f0 100644
--- a/make/topdir.mk
+++ b/make/topdir.mk
@@ -104,6 +104,7 @@ include $(JWBDIR)/make/rules.mk
 include $(JWBDIR)/make/doc-rules.mk
 include $(JWBDIR)/make/list-files.mk
 include $(JWBDIR)/make/projects+project.mk
+include $(JWBDIR)/make/cache.mk
 
 STREAMLINE_PROJECT          ?= bash $(JWB_SCRIPT_DIR)/streamline-project.sh
 
@@ -115,7 +116,7 @@ TD_COPY_FILES               ?= $(filter-out Makefile,$(notdir $(wildcard $(TD_CO
 # -- Internal variables, define JW_PKG_TOPDIR_COPY_PATH if you want to
 #  add more files appended to the target files
 TD_COPY_SRC_PATH             = $(subst :,$(space),$(JW_PKG_TOPDIR_COPY_PATH))
-TD_GENERATE_FILES           += $(TD_COPY_FILES)
+TD_GENERATE_FILES           += $(TD_COPY_FILES) $(CACHE_PROJECT_MK)
 
 test: all
 format: topdir
diff --git a/scripts/jw-pkg-create-project.sh b/scripts/jw-pkg-create-project.sh
index 881e35b4..fc149892 100644
--- a/scripts/jw-pkg-create-project.sh
+++ b/scripts/jw-pkg-create-project.sh
@@ -103,8 +103,7 @@ cat_gitignore()
 	*.done
 	*.dist
 	*.dep.mk
-	.cache.mk
-	make/.cache-project.mk
+	.cache-project.mk
 	*.o
 	*.so.*
 	*.so