diff --git a/Documentation/config.txt b/Documentation/config.txt
index d5589cb865..81179bc9c4 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -880,6 +880,12 @@ relatively high IO latencies.  When enabled, Git will do the
 index comparison to the filesystem data in parallel, allowing
 overlapping IO's.  Defaults to true.
 
+core.fscache::
+	Enable additional caching of file system data for some operations.
++
+Git for Windows uses this to bulk-read and cache lstat data of entire
+directories (instead of doing lstat file by file).
+
 core.unsetenvvars::
 	EXPERIMENTAL, Windows-only: comma-separated list of environment
 	variables' names that need to be unset before spawning any other
diff --git a/builtin/commit.c b/builtin/commit.c
index 4610e3d8e3..c788afdec6 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1411,6 +1411,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
 		       PATHSPEC_PREFER_FULL,
 		       prefix, argv);
 
+	enable_fscache(1);
 	read_cache_preload(&s.pathspec);
 	refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, &s.pathspec, NULL, NULL);
 
diff --git a/compat/mingw.c b/compat/mingw.c
index 01d32d6873..452b3ffcbc 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -211,6 +211,7 @@ enum hide_dotfiles_type {
 
 static enum hide_dotfiles_type hide_dotfiles = HIDE_DOTFILES_DOTGITONLY;
 static char *unset_environment_variables;
+int core_fscache;
 
 int mingw_core_config(const char *var, const char *value, void *cb)
 {
@@ -222,6 +223,11 @@ int mingw_core_config(const char *var, const char *value, void *cb)
 		return 0;
 	}
 
+	if (!strcmp(var, "core.fscache")) {
+		core_fscache = git_config_bool(var, value);
+		return 0;
+	}
+
 	if (!strcmp(var, "core.unsetenvvars")) {
 		free(unset_environment_variables);
 		unset_environment_variables = xstrdup(value);
diff --git a/compat/mingw.h b/compat/mingw.h
index a590bab5d4..d07af8d782 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -11,6 +11,8 @@ typedef _sigset_t sigset_t;
 #undef _POSIX_THREAD_SAFE_FUNCTIONS
 #endif
 
+extern int core_fscache;
+
 extern int mingw_core_config(const char *var, const char *value, void *cb);
 #define platform_core_config mingw_core_config
 
diff --git a/git-compat-util.h b/git-compat-util.h
index d236d2b25b..0227f79e44 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1200,6 +1200,21 @@ static inline int is_missing_file_error(int errno_)
 	return (errno_ == ENOENT || errno_ == ENOTDIR);
 }
 
+/*
+ * Enable/disable a read-only cache for file system data on platforms that
+ * support it.
+ *
+ * Implementing a live-cache is complicated and requires special platform
+ * support (inotify, ReadDirectoryChangesW...). enable_fscache shall be used
+ * to mark sections of git code that extensively read from the file system
+ * without modifying anything. Implementations can use this to cache e.g. stat
+ * data or even file content without the need to synchronize with the file
+ * system.
+ */
+#ifndef enable_fscache
+#define enable_fscache(x) /* noop */
+#endif
+
 extern int cmd_main(int, const char **);
 
 /*
diff --git a/preload-index.c b/preload-index.c
index 2a83255e4e..84ca37fb55 100644
--- a/preload-index.c
+++ b/preload-index.c
@@ -92,6 +92,7 @@ static void preload_index(struct index_state *index,
 	offset = 0;
 	work = DIV_ROUND_UP(index->cache_nr, threads);
 	memset(&data, 0, sizeof(data));
+	enable_fscache(1);
 	for (i = 0; i < threads; i++) {
 		struct thread_data *p = data+i;
 		p->index = index;
@@ -108,6 +109,7 @@ static void preload_index(struct index_state *index,
 		if (pthread_join(p->pthread, NULL))
 			die("unable to join threaded lstat");
 	}
+	enable_fscache(0);
 }
 #endif