diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 19ab8421ae6..a2c53ebdbcf 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -239,6 +239,9 @@ ADD_SOURCES("Zend", "zend_language_parser.c zend_language_scanner.c \
 	zend_inheritance.c zend_smart_str.c zend_cpuinfo.c");
 
 ADD_FLAG("CFLAGS_BD_ZEND", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
+if (VS_TOOLSET && VCVERS >= 1914) {
+	ADD_FLAG("CFLAGS_BD_ZEND", "/d2FuncCache1");
+}
 
 /* XXX inspect this for other toolsets */
 //AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1);
@@ -249,12 +252,18 @@ ADD_SOURCES("main", "main.c snprintf.c spprintf.c getopt.c fopen_wrappers.c \
 	php_open_temporary_file.c output.c internal_functions.c php_sprintf.c \
 	php_syslog.c");
 ADD_FLAG("CFLAGS_BD_MAIN", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
+if (VS_TOOLSET && VCVERS >= 1914) {
+	ADD_FLAG("CFLAGS_BD_MAIN", "/d2FuncCache1");
+}
 
 AC_DEFINE('HAVE_STRNLEN', 1);
 
 ADD_SOURCES("main/streams", "streams.c cast.c memory.c filter.c plain_wrapper.c \
 	userspace.c transports.c xp_socket.c mmap.c glob_wrapper.c");
 ADD_FLAG("CFLAGS_BD_MAIN_STREAMS", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
+if (VS_TOOLSET && VCVERS >= 1914) {
+	ADD_FLAG("CFLAGS_BD_MAIN_STREAMS", "/d2FuncCache1");
+}
 
 ADD_SOURCES("win32", "dllmain.c glob.c readdir.c \
 	registry.c select.c sendmail.c time.c winutil.c wsyslog.c globals.c \
@@ -262,6 +271,9 @@ ADD_SOURCES("win32", "dllmain.c glob.c readdir.c \
 	inet.c fnmatch.c sockets.c console.c");
 
 ADD_FLAG("CFLAGS_BD_WIN32", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
+if (VS_TOOLSET && VCVERS >= 1914) {
+	ADD_FLAG("CFLAGS_BD_WIN32", "/d2FuncCache1");
+}
 
 PHP_INSTALL_HEADERS("", "Zend/ TSRM/ main/ main/streams/ win32/");