diff --git a/modules/meta/functions/zmanage b/modules/meta/functions/zmanage
index afb4320..075950c 100644
--- a/modules/meta/functions/zmanage
+++ b/modules/meta/functions/zmanage
@@ -25,7 +25,7 @@ case ${1} in
                ;;
   issue)       zsh ${tools}/zim_issue
                ;;
-  clean-cache) zsh ${tools}/zim_clean_cache && print 'Cleaned cache'
+  clean-cache) source ${tools}/zim_clean_cache && print 'Cleaned cache'
                ;;
   build-cache) source ${tools}/zim_build_cache && print 'Rebuilt cache'
                ;;
diff --git a/tools/zim_clean_cache b/tools/zim_clean_cache
index dd3ea7c..69f8eb8 100644
--- a/tools/zim_clean_cache
+++ b/tools/zim_clean_cache
@@ -2,7 +2,8 @@
 # zim_clean_cache - removes all zcompiled files
 #
 
-find ${ZIM_HOME} -iname '*.zwc' | xargs rm
-rm -f ${ZDOTDIR:-${HOME}}/.{zshrc.zwc,zcompdump,zcompdump.zwc}
+find ${ZIM_HOME} \( -name '*.zwc' -or -name '*.zwc.old' \) -delete
+rm -f ${ZDOTDIR:-${HOME}}/.zshrc.zwc{,.old}
+rm -f ${ZDOTDIR:-${HOME}}/${zcompdump_file:-.zcompdump}{,.zwc{,.old}}
 
 print 'To rebuild the completion cache, please restart your terminal'