diff --git a/bin/cdist-cache b/bin/cdist-cache
new file mode 100755
index 00000000..d4ea18bb
--- /dev/null
+++ b/bin/cdist-cache
@@ -0,0 +1,56 @@
+#!/bin/sh
+#
+# 2010 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+# 
+# Let's build a cconfig tree from a configuration
+# And save it into the cache tree
+#
+
+. cdist-config
+[ $# -eq 2 ] || __cdist_usage "<target host> <manifest>"
+set -u
+
+__cdist_target_host="$1"; shift
+__cdist_manifest="$1"; shift
+
+################################################################################
+# Export information for cdist-type-emulator or manifest
+#
+
+# Config dir should not get reset - FIXME: why did I do this?
+export __cdist_conf_dir
+
+# Used to record the source in the object
+export __cdist_manifest
+
+# Export information for manifests - __cdist_out_dir comes from cdist-config
+export __global="$__cdist_out_dir"
+
+################################################################################
+# The actual run
+#
+
+# Ensure binaries exist and are up-to-date
+cdist-type-build-emulation "${__cdist_out_type_bin_dir}" \
+   || __cdist_exit_err "Failed to build type emulation binaries"
+
+# prepend our path, so all cdist tools come before other tools
+export PATH="${__cdist_out_type_bin_dir}:$PATH"
+
+__cdist_exec_fail_on_error "${__cdist_manifest}"