diff --git a/src/bootstrap-amd.js b/src/bootstrap-amd.js
index 85e0ef9c85eceeafdf28942b9c3b755442351f3c..c8442633b5fa621f58c2af6d425ce78a98c2cbf7 100644
--- a/src/bootstrap-amd.js
+++ b/src/bootstrap-amd.js
@@ -19,7 +19,7 @@ loader.config({
 	nodeRequire: require,
 	nodeMain: __filename,
 	'vs/nls': nlsConfig,
-	nodeCachedDataDir: process.env['VSCODE_NODE_CACHED_DATA_DIR_' + process.pid]
+	nodeCachedDataDir: process.env['VSCODE_NODE_CACHED_DATA_DIR']
 });
 
 // Running in Electron
diff --git a/src/main.js b/src/main.js
index e02d54ec4d2192339337443972e7d9f03198c919..92375bc68c0705fca3dc08f7757c329e5a2e0be2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -90,7 +90,7 @@ function onReady() {
 				process.env['VSCODE_NLS_CONFIG'] = JSON.stringify(nlsConfig);
 
 				if (cachedDataDir) {
-					process.env['VSCODE_NODE_CACHED_DATA_DIR_' + process.pid] = cachedDataDir;
+					process.env['VSCODE_NODE_CACHED_DATA_DIR'] = cachedDataDir;
 				}
 
 				// Load main in AMD
diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts
index 7d7aacfc48f9a768cc98b975c9cbf0e432e5f780..a67945a33d97e81ace137a36424d539effbc258f 100644
--- a/src/vs/platform/environment/node/environmentService.ts
+++ b/src/vs/platform/environment/node/environmentService.ts
@@ -218,7 +218,7 @@ export class EnvironmentService implements IEnvironmentService {
 	get sharedIPCHandle(): string { return getIPCHandle(this.userDataPath, 'shared'); }
 
 	@memoize
-	get nodeCachedDataDir(): string { return this.isBuilt ? path.join(this.userDataPath, 'CachedData', product.commit || new Array(41).join('0')) : undefined; }
+	get nodeCachedDataDir(): string { return process.env['VSCODE_NODE_CACHED_DATA_DIR'] || undefined; }
 
 	get disableUpdates(): boolean { return !!this._args['disable-updates']; }
 	get disableCrashReporter(): boolean { return !!this._args['disable-crash-reporter']; }
diff --git a/src/vs/workbench/parts/terminal/node/terminalEnvironment.ts b/src/vs/workbench/parts/terminal/node/terminalEnvironment.ts
index 735b29d4428b0cb57e8a5a6e653a0b2ab65773a0..0259859e0cee99074b2b0cf2fb4a129954011dfe 100644
--- a/src/vs/workbench/parts/terminal/node/terminalEnvironment.ts
+++ b/src/vs/workbench/parts/terminal/node/terminalEnvironment.ts
@@ -67,19 +67,13 @@ export function sanitizeEnvironment(env: platform.IProcessEnvironment): void {
 		'VSCODE_NLS_CONFIG',
 		'VSCODE_PORTABLE',
 		'VSCODE_PID',
+		'VSCODE_NODE_CACHED_DATA_DIR'
 	];
 	keysToRemove.forEach((key) => {
 		if (env[key]) {
 			delete env[key];
 		}
 	});
-
-	// Remove keys based on regexp
-	Object.keys(env).forEach(key => {
-		if (key.search(/^VSCODE_NODE_CACHED_DATA_DIR_\d+$/) === 0) {
-			delete env[key];
-		}
-	});
 }
 
 export function addTerminalEnvironmentKeys(env: platform.IProcessEnvironment, isWindows: boolean, locale?: string): void {