diff --git a/bin/cdist-cache b/bin/cdist-cache
index 120b0df2..f9480162 100755
--- a/bin/cdist-cache
+++ b/bin/cdist-cache
@@ -27,11 +27,11 @@
 set -u
 
 __cdist_target_host="$1"; shift
+__cdist_ddir="$(__cdist_host_cache_dir "$__cdist_target_host")"
 
-mkdir -p "${__cdist_local_base_cache_dir}"
-__cdist_abs_cache_dir="$(cd "$__cdist_local_base_cache_dir" && pwd -P)"
-__cdist_abs_ddir="$__cdist_abs_cache_dir/$__cdist_target_host"
+# Create base to move into
+mkdir -p "$(__cdist_cache_dir)"
 
-echo "Saving cache to $__cdist_abs_ddir ..."
-rm -rf "$__cdist_abs_ddir"
-mv "$__cdist_local_base_dir" "$__cdist_abs_ddir"
+echo "Saving cache to $__cdist_ddir ..."
+rm -rf "$__cdist_ddir"
+mv "$__cdist_local_base_dir" "$__cdist_ddir"
diff --git a/bin/cdist-config b/bin/cdist-config
index 393a963b..fac1b5c6 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -105,6 +105,8 @@ __cdist_tmp_file=$(mktemp "$__cdist_tmp_dir/cdist.XXXXXXXXXXXX")
 # Local Base
 # 
 : ${__cdist_local_base_dir:=$__cdist_tmp_dir}
+
+# Cache may *NOT* be below __cdist_local_base_dir!
 : ${__cdist_local_base_cache_dir:=$__cdist_abs_mydir/../$__cdist_name_cache}
 
 : ${__cdist_conf_dir:="$(cd "$__cdist_abs_mydir/../conf" && pwd -P)"}
@@ -186,6 +188,19 @@ __cdist_init_deploy()
    ln -sf "$__cdist_conf_dir" "$__cdist_local_base_dir/$__cdist_name_conf_dir"
 }
 
+################################################################################
+# Cache
+#
+__cdist_cache_dir()
+{
+   cd "${__cdist_local_base_cache_dir}" && pwd -P
+}
+
+__cdist_host_cache_dir()
+{
+   echo "$(__cdist_cache_dir)/$1" 
+}
+
 ################################################################################
 # Object
 #