diff --git a/lib/common b/lib/common
index 915d5872e0..fef717eb2a 160000
--- a/lib/common
+++ b/lib/common
@@ -1 +1 @@
-Subproject commit 915d5872e06e0ca4a642b1f0df5e9aa9a28344f7
+Subproject commit fef717eb2a517b05339e81b87b214fac53be6a19
diff --git a/lib/options.ts b/lib/options.ts
index e0c29014f9..cf438f7f67 100644
--- a/lib/options.ts
+++ b/lib/options.ts
@@ -4,6 +4,7 @@ import path = require("path");
 import helpers = require("./common/helpers");
 import commonOptions = require("./common/options");
 import osenv = require("osenv");
+import hostInfo = require("./common/host-info");
 
 var knownOpts:any = {
 		"frameworkPath": String,
@@ -23,11 +24,19 @@ var knownOpts:any = {
 _.extend(knownOpts, commonOptions.knownOpts);
 _.extend(shorthands, commonOptions.shorthands);
 
-commonOptions.setProfileDir(".nativescript-cli");
+var defaultProfileDir = "";
+var nativeScriptCacheFolder = ".nativescript-cli";
+if(hostInfo.isWindows()) {
+	defaultProfileDir = path.join(process.env.LocalAppData, nativeScriptCacheFolder);
+} else {
+	defaultProfileDir = path.join(osenv.home(), ".local/share", nativeScriptCacheFolder);
+}
+
+commonOptions.setProfileDir(defaultProfileDir);
 var parsed = helpers.getParsedOptions(knownOpts, shorthands);
 
 Object.keys(parsed).forEach((opt) => exports[opt] = parsed[opt]);
 exports.knownOpts = knownOpts;
 
 declare var exports:any;
-export = exports;
\ No newline at end of file
+export = exports;
diff --git a/test/stubs.ts b/test/stubs.ts
index 9cdef9d031..c8e1b2dbf4 100644
--- a/test/stubs.ts
+++ b/test/stubs.ts
@@ -119,6 +119,14 @@ export class FileSystemStub implements IFileSystem {
 	symlink(sourePath: string, destinationPath: string): IFuture<void> {
 		return undefined;
 	}
+
+	closeStream(stream: any): IFuture<void> {
+		return undefined;
+	}
+
+	setCurrentUserAsOwner(path: string, owner: string): IFuture<void> {
+		return undefined;
+	}
 }
 
 export class ErrorsStub implements IErrors {