diff --git a/.gitignore b/.gitignore
index e9daa84..e4e4e25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,4 +48,8 @@ deep-docs/
 
 ctf/
 
+# dev-kit common.mk cache files
 common.mk
+.common.mk-version
+.common.mk-checked
+.common.mk-download		
diff --git a/Makefile b/Makefile
index 90ffd43..9a8ecad 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,13 @@
 # Include ODC common make targets
-DEV_KIT_VERSION := v1.0.7
+DEV_KIT_VERSION := v1.0.8
 -include common.mk
 common.mk:
-	curl --fail -sSL https://raw.githubusercontent.com/opendefensecloud/dev-kit/$(DEV_KIT_VERSION)/common.mk -o common.mk.download && \
-	mv common.mk.download $@
+	@[ -f .common.mk-download ] || \
+		curl --fail -sSL https://raw.githubusercontent.com/opendefensecloud/dev-kit/$(DEV_KIT_VERSION)/common.mk \
+		  -o .common.mk-download
+	mv .common.mk-download $@
+	printf '%s' '$(DEV_KIT_VERSION)' > .common.mk-version
+	touch .common.mk-checked
 
 .PHONY: setup
 setup: $(OCM)