From 22b398ac0997eec565711bdf527cae9725b9c216 Mon Sep 17 00:00:00 2001
From: Thim Lohse <thimdev@gmail.com>
Date: Fri, 9 Oct 2020 01:00:50 +0200
Subject: [PATCH 1/9] first iteration of cached remote values

---
 package-lock.json                      | 20 ++++++++++++++
 package.json                           |  2 ++
 src/cache/index.ts                     | 37 ++++++++++++++++++++++++++
 src/commands/helpHandler.ts            |  1 +
 src/commands/pickHandler.ts            |  2 +-
 src/entry/cli.ts                       |  3 ++-
 src/helpers/branchListPromptPromise.ts |  4 ++-
 src/helpers/getBranchList.ts           | 27 ++++++++++++++-----
 src/helpers/pickRemoteBranch.ts        |  9 +++++--
 src/types/index.d.ts                   |  2 ++
 src/types/index.ts                     |  1 -
 11 files changed, 95 insertions(+), 13 deletions(-)
 create mode 100644 src/cache/index.ts
 create mode 100644 src/types/index.d.ts
 delete mode 100644 src/types/index.ts

diff --git a/package-lock.json b/package-lock.json
index fc8e084..1586b71 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1110,6 +1110,11 @@
             "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
             "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
         },
+        "mirrorkey": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/mirrorkey/-/mirrorkey-1.2.0.tgz",
+            "integrity": "sha1-dcPtdLHslZUCnrEcyvHFHfYC/zw="
+        },
         "mkdirp": {
             "version": "0.5.5",
             "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
@@ -1136,6 +1141,21 @@
             "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
             "dev": true
         },
+        "node-cache": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/node-cache/-/node-cache-5.1.2.tgz",
+            "integrity": "sha512-t1QzWwnk4sjLWaQAS8CHgOJ+RAfmHpxFWmc36IWTiWHQfs0w5JDMBS1b1ZxQteo0vVVuWJvIUKHDkkeK7vIGCg==",
+            "requires": {
+                "clone": "2.x"
+            },
+            "dependencies": {
+                "clone": {
+                    "version": "2.1.2",
+                    "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+                    "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18="
+                }
+            }
+        },
         "once": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
diff --git a/package.json b/package.json
index 6e62666..76781bc 100644
--- a/package.json
+++ b/package.json
@@ -63,6 +63,8 @@
         "inquirer": "^7.3.3",
         "inquirer-autocomplete-prompt": "^1.2.0",
         "minimist": "^1.2.5",
+        "mirrorkey": "^1.2.0",
+        "node-cache": "^5.1.2",
         "ora": "^5.1.0",
         "ramda": "^0.27.1",
         "tslib": "^2.0.1"
diff --git a/src/cache/index.ts b/src/cache/index.ts
new file mode 100644
index 0000000..e637123
--- /dev/null
+++ b/src/cache/index.ts
@@ -0,0 +1,37 @@
+import NodeCache from 'node-cache'
+import mirrorKey from 'mirrorkey'
+import { } from 'ramda'
+
+export default class Cache {
+    private static instance: NodeCache;
+    private static cacheOptions: NodeCache.Options = { stdTTL: 60 * 5 }
+
+    private constructor() { return }
+
+    /**
+     * The static method that controls the access to the singleton instance.
+     *
+     * This implementation let you subclass the Singleton class while keeping
+     * just one instance of each subclass around.
+     */
+    public static getInstance(): NodeCache {
+        if (!Cache.instance) {
+            Cache.instance = new NodeCache(this.cacheOptions);
+        }
+        return Cache.instance;
+    }
+
+
+    public static storeMultiple(array: string[] | undefined): boolean {
+        if (!array) return false
+        const multiSet = Object.entries(mirrorKey(array)).map(entry => ({ key: entry[0], val: entry[1] }))
+        const instance = Cache.getInstance()
+        return instance.mset(multiSet)
+    }
+
+    public static getRemoteBranchesFromCache(): string[] {
+        const instance = Cache.getInstance()
+        return instance.keys()
+
+    }
+}
\ No newline at end of file
diff --git a/src/commands/helpHandler.ts b/src/commands/helpHandler.ts
index 89bc340..c80fddc 100644
--- a/src/commands/helpHandler.ts
+++ b/src/commands/helpHandler.ts
@@ -23,6 +23,7 @@ const helpDescription: Record<string, string> = {
         bl pick <option>
 
         -r, --remote ....... checkout remote branch with fuzzy search functionality
+        -c --cache ......... pick from cached list of branches (remote only)
         `,
     create: `
         bl create <option>
diff --git a/src/commands/pickHandler.ts b/src/commands/pickHandler.ts
index f2455c1..f8bf090 100644
--- a/src/commands/pickHandler.ts
+++ b/src/commands/pickHandler.ts
@@ -10,5 +10,5 @@ export default async (argv: ParsedArgs): Promise<void | Error> => {
     if (!argv.r) {
         return await pickLocalBranch()
     }
-    return await pickRemoteBranch()
+    return await pickRemoteBranch({ fromCache: !!argv.c })
 }
diff --git a/src/entry/cli.ts b/src/entry/cli.ts
index e235bee..60a7cd9 100644
--- a/src/entry/cli.ts
+++ b/src/entry/cli.ts
@@ -6,13 +6,14 @@ import { ErrorHandler } from '../handlers'
 const parseArgs = (rawArgs: string[]) =>
     minimist(rawArgs.slice(2), {
         string: ['pick', 'delete', 'create'],
-        boolean: ['version', 'help', 'multiple', 'remote', 'upstream'],
+        boolean: ['version', 'help', 'multiple', 'remote', 'upstream', 'cache'],
         alias: {
             v: 'version',
             h: 'help',
             m: 'multiple',
             r: 'remote',
             u: 'upstream',
+            c: 'cache'
         },
     })
 
diff --git a/src/helpers/branchListPromptPromise.ts b/src/helpers/branchListPromptPromise.ts
index e7ad017..1c6f543 100644
--- a/src/helpers/branchListPromptPromise.ts
+++ b/src/helpers/branchListPromptPromise.ts
@@ -16,6 +16,7 @@ interface BranchListPromptParams {
     multipleChoice?: boolean
     fetchRemote?: boolean
     withSearch?: boolean
+    fromCache?: boolean
 }
 export default async function ({
     message,
@@ -23,8 +24,9 @@ export default async function ({
     multipleChoice = false,
     fetchRemote = false,
     withSearch = false,
+    fromCache = false,
 }: BranchListPromptParams): Promise<Answers> {
-    const branchList = await getBranchList({ fetchRemote })
+    const branchList = await getBranchList({ fetchRemote, fromCache })
 
     let questions: Question[] = []
 
diff --git a/src/helpers/getBranchList.ts b/src/helpers/getBranchList.ts
index 428ed51..2c5d118 100644
--- a/src/helpers/getBranchList.ts
+++ b/src/helpers/getBranchList.ts
@@ -1,5 +1,6 @@
 import util from 'util'
 import { anyPass, isNil, isEmpty } from 'ramda'
+import Cache from '../cache'
 import { NoBranchError } from '../errors'
 import childProcess from 'child_process'
 const exec = util.promisify(childProcess.exec)
@@ -11,6 +12,7 @@ interface FormatBranchesStringOptions {
 }
 interface GetBranchListParams {
     fetchRemote?: boolean
+    fromCache?: boolean
 }
 
 interface FilterNewBranchesParams {
@@ -23,6 +25,9 @@ const gitListLocalBranchesScript = `git branch`
 const gitListRemoteBranchesScript = `git fetch --prune && git branch -r`
 
 /* Util functions */
+
+const shouldFetchFromCache = (cacheInstance: ReturnType<typeof Cache.getInstance>, fromCache?: boolean): boolean => cacheInstance.getStats().keys !== 0 && !!fromCache
+
 const filterNewOnRemote = (parameters: FilterNewBranchesParams) => {
     const remote = new Set(parameters.remoteBranches)
     const local = new Set(parameters.localBranches)
@@ -66,13 +71,21 @@ export default async function (
     )?.stdout.trim()
 
     if (options?.fetchRemote) {
-        remoteBranches = (
-            await exec(gitListRemoteBranchesScript)
-        )?.stdout.trim()
-        branchList = formatBranchesString({
-            localBranchesString: localBranches,
-            remoteBranchesString: remoteBranches,
-        })
+
+        if (shouldFetchFromCache(Cache.getInstance(), options?.fromCache)) {
+            branchList = Cache.getRemoteBranchesFromCache()
+        } else {
+            remoteBranches = (
+                await exec(gitListRemoteBranchesScript)
+            )?.stdout.trim()
+            branchList = formatBranchesString({
+                localBranchesString: localBranches,
+                remoteBranchesString: remoteBranches,
+            })
+            Cache.storeMultiple(branchList)
+        }
+
+
     } else {
         branchList = formatBranchesString({
             localBranchesString: localBranches,
diff --git a/src/helpers/pickRemoteBranch.ts b/src/helpers/pickRemoteBranch.ts
index 3f2bc8c..eba03c4 100644
--- a/src/helpers/pickRemoteBranch.ts
+++ b/src/helpers/pickRemoteBranch.ts
@@ -4,14 +4,19 @@ import branchListPromptPromise from './branchListPromptPromise'
 import { PickBranchError } from '../errors'
 import childProcess from 'child_process'
 const exec = util.promisify(childProcess.exec)
-
-export default async function (): Promise<void | Error> {
+/* Interfaces */
+interface PickRemoteBranchOptions {
+    fromCache?: boolean
+}
+export default async function (options: PickRemoteBranchOptions): Promise<void | Error> {
     let spinner = ora()
     try {
         const { branch } = await branchListPromptPromise({
             message: 'Which new (remote) branch would you like to check out?',
             fetchRemote: true,
             withSearch: true,
+            fromCache: options.fromCache
+
         })
 
         if (branch) {
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
new file mode 100644
index 0000000..0b5b952
--- /dev/null
+++ b/src/types/index.d.ts
@@ -0,0 +1,2 @@
+declare module 'inquirer-autocomplete-prompt';
+declare module 'mirrorkey';
diff --git a/src/types/index.ts b/src/types/index.ts
deleted file mode 100644
index 40cf8fe..0000000
--- a/src/types/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare module 'inquirer-autocomplete-prompt'

From 8d36d95148b4aa65019c33ad2b861889c4a1588b Mon Sep 17 00:00:00 2001
From: Thim Lohse <thimdev@gmail.com>
Date: Fri, 9 Oct 2020 01:01:37 +0200
Subject: [PATCH 2/9] update values

---
 src/cache/index.ts              | 21 ++++++++++++---------
 src/entry/cli.ts                |  2 +-
 src/helpers/getBranchList.ts    |  8 ++++----
 src/helpers/pickRemoteBranch.ts |  7 ++++---
 src/types/index.d.ts            |  4 ++--
 5 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/cache/index.ts b/src/cache/index.ts
index e637123..1c6abae 100644
--- a/src/cache/index.ts
+++ b/src/cache/index.ts
@@ -1,12 +1,14 @@
 import NodeCache from 'node-cache'
 import mirrorKey from 'mirrorkey'
-import { } from 'ramda'
+import {} from 'ramda'
 
 export default class Cache {
-    private static instance: NodeCache;
+    private static instance: NodeCache
     private static cacheOptions: NodeCache.Options = { stdTTL: 60 * 5 }
 
-    private constructor() { return }
+    private constructor() {
+        return
+    }
 
     /**
      * The static method that controls the access to the singleton instance.
@@ -16,15 +18,17 @@ export default class Cache {
      */
     public static getInstance(): NodeCache {
         if (!Cache.instance) {
-            Cache.instance = new NodeCache(this.cacheOptions);
+            Cache.instance = new NodeCache(this.cacheOptions)
         }
-        return Cache.instance;
+        return Cache.instance
     }
 
-
     public static storeMultiple(array: string[] | undefined): boolean {
         if (!array) return false
-        const multiSet = Object.entries(mirrorKey(array)).map(entry => ({ key: entry[0], val: entry[1] }))
+        const multiSet = Object.entries(mirrorKey(array)).map((entry) => ({
+            key: entry[0],
+            val: entry[1],
+        }))
         const instance = Cache.getInstance()
         return instance.mset(multiSet)
     }
@@ -32,6 +36,5 @@ export default class Cache {
     public static getRemoteBranchesFromCache(): string[] {
         const instance = Cache.getInstance()
         return instance.keys()
-
     }
-}
\ No newline at end of file
+}
diff --git a/src/entry/cli.ts b/src/entry/cli.ts
index 60a7cd9..366357d 100644
--- a/src/entry/cli.ts
+++ b/src/entry/cli.ts
@@ -13,7 +13,7 @@ const parseArgs = (rawArgs: string[]) =>
             m: 'multiple',
             r: 'remote',
             u: 'upstream',
-            c: 'cache'
+            c: 'cache',
         },
     })
 
diff --git a/src/helpers/getBranchList.ts b/src/helpers/getBranchList.ts
index 2c5d118..de5d26d 100644
--- a/src/helpers/getBranchList.ts
+++ b/src/helpers/getBranchList.ts
@@ -26,7 +26,10 @@ const gitListRemoteBranchesScript = `git fetch --prune && git branch -r`
 
 /* Util functions */
 
-const shouldFetchFromCache = (cacheInstance: ReturnType<typeof Cache.getInstance>, fromCache?: boolean): boolean => cacheInstance.getStats().keys !== 0 && !!fromCache
+const shouldFetchFromCache = (
+    cacheInstance: ReturnType<typeof Cache.getInstance>,
+    fromCache?: boolean
+): boolean => cacheInstance.getStats().keys !== 0 && !!fromCache
 
 const filterNewOnRemote = (parameters: FilterNewBranchesParams) => {
     const remote = new Set(parameters.remoteBranches)
@@ -71,7 +74,6 @@ export default async function (
     )?.stdout.trim()
 
     if (options?.fetchRemote) {
-
         if (shouldFetchFromCache(Cache.getInstance(), options?.fromCache)) {
             branchList = Cache.getRemoteBranchesFromCache()
         } else {
@@ -84,8 +86,6 @@ export default async function (
             })
             Cache.storeMultiple(branchList)
         }
-
-
     } else {
         branchList = formatBranchesString({
             localBranchesString: localBranches,
diff --git a/src/helpers/pickRemoteBranch.ts b/src/helpers/pickRemoteBranch.ts
index eba03c4..b14b8ad 100644
--- a/src/helpers/pickRemoteBranch.ts
+++ b/src/helpers/pickRemoteBranch.ts
@@ -8,15 +8,16 @@ const exec = util.promisify(childProcess.exec)
 interface PickRemoteBranchOptions {
     fromCache?: boolean
 }
-export default async function (options: PickRemoteBranchOptions): Promise<void | Error> {
+export default async function (
+    options: PickRemoteBranchOptions
+): Promise<void | Error> {
     let spinner = ora()
     try {
         const { branch } = await branchListPromptPromise({
             message: 'Which new (remote) branch would you like to check out?',
             fetchRemote: true,
             withSearch: true,
-            fromCache: options.fromCache
-
+            fromCache: options.fromCache,
         })
 
         if (branch) {
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index 0b5b952..626bb57 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -1,2 +1,2 @@
-declare module 'inquirer-autocomplete-prompt';
-declare module 'mirrorkey';
+declare module 'inquirer-autocomplete-prompt'
+declare module 'mirrorkey'

From 69d25b6172f96152d168d9bd9cf06ed1a041e994 Mon Sep 17 00:00:00 2001
From: Thim Lohse <thimdev@gmail.com>
Date: Fri, 9 Oct 2020 01:05:09 +0200
Subject: [PATCH 3/9] updated help menu

---
 src/commands/helpHandler.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commands/helpHandler.ts b/src/commands/helpHandler.ts
index c80fddc..544ee5f 100644
--- a/src/commands/helpHandler.ts
+++ b/src/commands/helpHandler.ts
@@ -23,7 +23,7 @@ const helpDescription: Record<string, string> = {
         bl pick <option>
 
         -r, --remote ....... checkout remote branch with fuzzy search functionality
-        -c --cache ......... pick from cached list of branches (remote only)
+        -c --cache ......... pick from cached list of branches of available (remote only)
         `,
     create: `
         bl create <option>

From 58b0b99db9bdc30ea938d6b24d9babca19194554 Mon Sep 17 00:00:00 2001
From: Thim Lohse <thimdev@gmail.com>
Date: Fri, 9 Oct 2020 23:12:38 +0200
Subject: [PATCH 4/9] changed cache to persistant cli config storage

---
 package-lock.json                      | 160 +++++++++++++++++++------
 package.json                           |   5 +-
 src/cache/index.ts                     |  40 -------
 src/commands/pickHandler.ts            |   2 +-
 src/helpers/branchListPromptPromise.ts |   6 +-
 src/helpers/getBranchList.ts           |  47 ++++----
 src/helpers/pickRemoteBranch.ts        |   4 +-
 src/persistantLocalStore/index.ts      |  26 ++++
 8 files changed, 180 insertions(+), 110 deletions(-)
 delete mode 100644 src/cache/index.ts
 create mode 100644 src/persistantLocalStore/index.ts

diff --git a/package-lock.json b/package-lock.json
index 1586b71..1e420be 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -143,6 +143,12 @@
                 "chalk": "*"
             }
         },
+        "@types/configstore": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@types/configstore/-/configstore-4.0.0.tgz",
+            "integrity": "sha512-SvCBBPzOIe/3Tu7jTl2Q8NjITjLmq9m7obzjSyb8PXWWZ31xVK6w4T6v8fOx+lrgQnqk3Yxc00LDolFsSakKCA==",
+            "dev": true
+        },
         "@types/inquirer": {
             "version": "7.3.1",
             "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-7.3.1.tgz",
@@ -166,15 +172,15 @@
             "dev": true
         },
         "@types/node": {
-            "version": "14.11.5",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.5.tgz",
-            "integrity": "sha512-jVFzDV6NTbrLMxm4xDSIW/gKnk8rQLF9wAzLWIOg+5nU6ACrIMndeBdXci0FGtqJbP9tQvm6V39eshc96TO2wQ==",
+            "version": "14.11.8",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.8.tgz",
+            "integrity": "sha512-KPcKqKm5UKDkaYPTuXSx8wEP7vE9GnuaXIZKijwRYcePpZFDVuy2a57LarFKiORbHOuTOOwYzxVxcUzsh2P2Pw==",
             "dev": true
         },
         "@types/ramda": {
-            "version": "0.27.20",
-            "resolved": "https://registry.npmjs.org/@types/ramda/-/ramda-0.27.20.tgz",
-            "integrity": "sha512-Oxi5JMT6YIiMLP0gir8Eiy22f1CfbKLGGisu6tDrLCl5gHQd0EeUTUCfy7zdWfV19WEU/ccUVBfKOh2B1c2DbQ==",
+            "version": "0.27.23",
+            "resolved": "https://registry.npmjs.org/@types/ramda/-/ramda-0.27.23.tgz",
+            "integrity": "sha512-gcg91dmYVCt1c7tPr76iON1HF3YA09D77A7T5z/KgVY4SSlM7o2bnek1HQZ/JhLlbeUSmRcKMJ2f2D8d97qQMw==",
             "dev": true,
             "requires": {
                 "ts-toolbelt": "^6.3.3"
@@ -202,6 +208,14 @@
                 "regexpp": "^3.0.0",
                 "semver": "^7.3.2",
                 "tsutils": "^3.17.1"
+            },
+            "dependencies": {
+                "semver": {
+                    "version": "7.3.2",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+                    "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+                    "dev": true
+                }
             }
         },
         "@typescript-eslint/experimental-utils": {
@@ -260,6 +274,14 @@
                 "lodash": "^4.17.15",
                 "semver": "^7.3.2",
                 "tsutils": "^3.17.1"
+            },
+            "dependencies": {
+                "semver": {
+                    "version": "7.3.2",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+                    "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+                    "dev": true
+                }
             }
         },
         "@typescript-eslint/visitor-keys": {
@@ -455,6 +477,19 @@
                 "typedarray": "^0.0.6"
             }
         },
+        "configstore": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
+            "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
+            "requires": {
+                "dot-prop": "^5.2.0",
+                "graceful-fs": "^4.1.2",
+                "make-dir": "^3.0.0",
+                "unique-string": "^2.0.0",
+                "write-file-atomic": "^3.0.0",
+                "xdg-basedir": "^4.0.0"
+            }
+        },
         "core-util-is": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -472,6 +507,11 @@
                 "which": "^2.0.1"
             }
         },
+        "crypto-random-string": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
+            "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="
+        },
         "debug": {
             "version": "4.2.0",
             "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
@@ -519,6 +559,14 @@
                 "esutils": "^2.0.2"
             }
         },
+        "dot-prop": {
+            "version": "5.3.0",
+            "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
+            "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
+            "requires": {
+                "is-obj": "^2.0.0"
+            }
+        },
         "emoji-regex": {
             "version": "8.0.0",
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -539,9 +587,9 @@
             "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
         },
         "eslint": {
-            "version": "7.10.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.10.0.tgz",
-            "integrity": "sha512-BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA==",
+            "version": "7.11.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.11.0.tgz",
+            "integrity": "sha512-G9+qtYVCHaDi1ZuWzBsOWo2wSwd70TXnU6UHA3cTYHp7gCTXZcpggWFoUVAMRarg68qtPoNfFbzPh+VdOgmwmw==",
             "dev": true,
             "requires": {
                 "@babel/code-frame": "^7.0.0",
@@ -554,7 +602,7 @@
                 "enquirer": "^2.3.5",
                 "eslint-scope": "^5.1.1",
                 "eslint-utils": "^2.1.0",
-                "eslint-visitor-keys": "^1.3.0",
+                "eslint-visitor-keys": "^2.0.0",
                 "espree": "^7.3.0",
                 "esquery": "^1.2.0",
                 "esutils": "^2.0.2",
@@ -583,17 +631,17 @@
                 "v8-compile-cache": "^2.0.3"
             },
             "dependencies": {
-                "eslint-visitor-keys": {
-                    "version": "1.3.0",
-                    "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-                    "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-                    "dev": true
-                },
                 "ignore": {
                     "version": "4.0.6",
                     "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
                     "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
                     "dev": true
+                },
+                "semver": {
+                    "version": "7.3.2",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+                    "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+                    "dev": true
                 }
             }
         },
@@ -882,6 +930,11 @@
                 "slash": "^3.0.0"
             }
         },
+        "graceful-fs": {
+            "version": "4.2.4",
+            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+            "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
+        },
         "has-flag": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -914,8 +967,7 @@
         "imurmurhash": {
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-            "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-            "dev": true
+            "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
         },
         "inflight": {
             "version": "1.0.6",
@@ -996,6 +1048,16 @@
             "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
             "dev": true
         },
+        "is-obj": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+            "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="
+        },
+        "is-typedarray": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+            "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+        },
         "isarray": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -1069,6 +1131,14 @@
                 "yallist": "^2.1.2"
             }
         },
+        "make-dir": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+            "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+            "requires": {
+                "semver": "^6.0.0"
+            }
+        },
         "make-error": {
             "version": "1.3.6",
             "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
@@ -1141,21 +1211,6 @@
             "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
             "dev": true
         },
-        "node-cache": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/node-cache/-/node-cache-5.1.2.tgz",
-            "integrity": "sha512-t1QzWwnk4sjLWaQAS8CHgOJ+RAfmHpxFWmc36IWTiWHQfs0w5JDMBS1b1ZxQteo0vVVuWJvIUKHDkkeK7vIGCg==",
-            "requires": {
-                "clone": "2.x"
-            },
-            "dependencies": {
-                "clone": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-                    "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18="
-                }
-            }
-        },
         "once": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -1424,10 +1479,9 @@
             "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
         },
         "semver": {
-            "version": "7.3.2",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-            "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-            "dev": true
+            "version": "6.3.0",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
         },
         "shebang-command": {
             "version": "2.0.0",
@@ -1712,12 +1766,28 @@
             "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
             "dev": true
         },
+        "typedarray-to-buffer": {
+            "version": "3.1.5",
+            "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+            "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+            "requires": {
+                "is-typedarray": "^1.0.0"
+            }
+        },
         "typescript": {
             "version": "4.0.3",
             "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz",
             "integrity": "sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==",
             "dev": true
         },
+        "unique-string": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
+            "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
+            "requires": {
+                "crypto-random-string": "^2.0.0"
+            }
+        },
         "uri-js": {
             "version": "4.4.0",
             "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
@@ -1777,6 +1847,22 @@
                 "mkdirp": "^0.5.1"
             }
         },
+        "write-file-atomic": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+            "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+            "requires": {
+                "imurmurhash": "^0.1.4",
+                "is-typedarray": "^1.0.0",
+                "signal-exit": "^3.0.2",
+                "typedarray-to-buffer": "^3.1.5"
+            }
+        },
+        "xdg-basedir": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
+            "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="
+        },
         "yallist": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
diff --git a/package.json b/package.json
index 76781bc..4ff8ff8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@thimlohsedev/branch_lightyear",
     "version": "1.8.0",
-    "description": "The comfort of Git in an IDE right in the terminal",
+    "description": "The comfort of some pretty sleek Git commands right in the terminal",
     "bin": {
         "@thimlohsedev/bl": "bin/branch_lightyear",
         "bl": "bin/branch_lightyear"
@@ -58,13 +58,13 @@
     "license": "MIT",
     "dependencies": {
         "chalk": "^4.1.0",
+        "configstore": "^5.0.1",
         "esm": "^3.2.25",
         "fuzzy": "^0.1.3",
         "inquirer": "^7.3.3",
         "inquirer-autocomplete-prompt": "^1.2.0",
         "minimist": "^1.2.5",
         "mirrorkey": "^1.2.0",
-        "node-cache": "^5.1.2",
         "ora": "^5.1.0",
         "ramda": "^0.27.1",
         "tslib": "^2.0.1"
@@ -75,6 +75,7 @@
         "@types/minimist": "^1.2.0",
         "@types/node": "^14.11.2",
         "@types/ramda": "^0.27.19",
+        "@types/configstore": "^4.0.0",
         "@typescript-eslint/eslint-plugin": "^4.3.0",
         "@typescript-eslint/parser": "^4.3.0",
         "eslint": "^7.10.0",
diff --git a/src/cache/index.ts b/src/cache/index.ts
deleted file mode 100644
index 1c6abae..0000000
--- a/src/cache/index.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import NodeCache from 'node-cache'
-import mirrorKey from 'mirrorkey'
-import {} from 'ramda'
-
-export default class Cache {
-    private static instance: NodeCache
-    private static cacheOptions: NodeCache.Options = { stdTTL: 60 * 5 }
-
-    private constructor() {
-        return
-    }
-
-    /**
-     * The static method that controls the access to the singleton instance.
-     *
-     * This implementation let you subclass the Singleton class while keeping
-     * just one instance of each subclass around.
-     */
-    public static getInstance(): NodeCache {
-        if (!Cache.instance) {
-            Cache.instance = new NodeCache(this.cacheOptions)
-        }
-        return Cache.instance
-    }
-
-    public static storeMultiple(array: string[] | undefined): boolean {
-        if (!array) return false
-        const multiSet = Object.entries(mirrorKey(array)).map((entry) => ({
-            key: entry[0],
-            val: entry[1],
-        }))
-        const instance = Cache.getInstance()
-        return instance.mset(multiSet)
-    }
-
-    public static getRemoteBranchesFromCache(): string[] {
-        const instance = Cache.getInstance()
-        return instance.keys()
-    }
-}
diff --git a/src/commands/pickHandler.ts b/src/commands/pickHandler.ts
index f8bf090..7eb74d7 100644
--- a/src/commands/pickHandler.ts
+++ b/src/commands/pickHandler.ts
@@ -10,5 +10,5 @@ export default async (argv: ParsedArgs): Promise<void | Error> => {
     if (!argv.r) {
         return await pickLocalBranch()
     }
-    return await pickRemoteBranch({ fromCache: !!argv.c })
+    return await pickRemoteBranch({ fromLocalStore: !!argv.c })
 }
diff --git a/src/helpers/branchListPromptPromise.ts b/src/helpers/branchListPromptPromise.ts
index 1c6f543..c4d62a7 100644
--- a/src/helpers/branchListPromptPromise.ts
+++ b/src/helpers/branchListPromptPromise.ts
@@ -16,7 +16,7 @@ interface BranchListPromptParams {
     multipleChoice?: boolean
     fetchRemote?: boolean
     withSearch?: boolean
-    fromCache?: boolean
+    fromLocalStore?: boolean
 }
 export default async function ({
     message,
@@ -24,9 +24,9 @@ export default async function ({
     multipleChoice = false,
     fetchRemote = false,
     withSearch = false,
-    fromCache = false,
+    fromLocalStore = false,
 }: BranchListPromptParams): Promise<Answers> {
-    const branchList = await getBranchList({ fetchRemote, fromCache })
+    const branchList = await getBranchList({ fetchRemote, fromLocalStore })
 
     let questions: Question[] = []
 
diff --git a/src/helpers/getBranchList.ts b/src/helpers/getBranchList.ts
index de5d26d..4ceb938 100644
--- a/src/helpers/getBranchList.ts
+++ b/src/helpers/getBranchList.ts
@@ -1,6 +1,6 @@
 import util from 'util'
 import { anyPass, isNil, isEmpty } from 'ramda'
-import Cache from '../cache'
+import configStoreApi, { ConfigStoreApi } from '../persistantLocalStore'
 import { NoBranchError } from '../errors'
 import childProcess from 'child_process'
 const exec = util.promisify(childProcess.exec)
@@ -12,7 +12,7 @@ interface FormatBranchesStringOptions {
 }
 interface GetBranchListParams {
     fetchRemote?: boolean
-    fromCache?: boolean
+    fromLocalStore?: boolean
 }
 
 interface FilterNewBranchesParams {
@@ -26,10 +26,10 @@ const gitListRemoteBranchesScript = `git fetch --prune && git branch -r`
 
 /* Util functions */
 
-const shouldFetchFromCache = (
-    cacheInstance: ReturnType<typeof Cache.getInstance>,
+const shouldFetchFromLocalStore = (
+    configStore: ConfigStoreApi,
     fromCache?: boolean
-): boolean => cacheInstance.getStats().keys !== 0 && !!fromCache
+): boolean => configStore.hasItems() && !!fromCache
 
 const filterNewOnRemote = (parameters: FilterNewBranchesParams) => {
     const remote = new Set(parameters.remoteBranches)
@@ -41,7 +41,7 @@ const filterNewOnRemote = (parameters: FilterNewBranchesParams) => {
 const formatBranchesString = (options: FormatBranchesStringOptions) => {
     const { localBranchesString, remoteBranchesString } = options
 
-    const localBranches = localBranchesString
+    let localBranches = localBranchesString
         .split('\n')
         .filter((branch) => !branch.includes('*'))
         .map((branch) => branch.trim())
@@ -49,19 +49,16 @@ const formatBranchesString = (options: FormatBranchesStringOptions) => {
     if (!remoteBranchesString) {
         return localBranches
     }
-    if (remoteBranchesString) {
-        const localBranches = localBranchesString
-            .split('\n')
-            .map((branch) => branch.replace('*', ''))
-            .map((branch) => branch.trim())
-        const remoteBranches = remoteBranchesString
-            .split('\n')
-            .filter((branch) => !branch.includes('HEAD'))
-            .map((branch) => branch.split('origin/')[1])
-        return filterNewOnRemote({ localBranches, remoteBranches })
-    }
 
-    return
+    localBranches = localBranchesString
+        .split('\n')
+        .map((branch) => branch.replace('*', ''))
+        .map((branch) => branch.trim())
+    const remoteBranches = remoteBranchesString
+        .split('\n')
+        .filter((branch) => !branch.includes('HEAD'))
+        .map((branch) => branch.split('origin/')[1])
+    return filterNewOnRemote({ localBranches, remoteBranches })
 }
 
 export default async function (
@@ -74,18 +71,18 @@ export default async function (
     )?.stdout.trim()
 
     if (options?.fetchRemote) {
-        if (shouldFetchFromCache(Cache.getInstance(), options?.fromCache)) {
-            branchList = Cache.getRemoteBranchesFromCache()
+        if (shouldFetchFromLocalStore(configStoreApi, options.fromLocalStore)) {
+            remoteBranches = configStoreApi.get('remoteBranches')
         } else {
             remoteBranches = (
                 await exec(gitListRemoteBranchesScript)
             )?.stdout.trim()
-            branchList = formatBranchesString({
-                localBranchesString: localBranches,
-                remoteBranchesString: remoteBranches,
-            })
-            Cache.storeMultiple(branchList)
+            configStoreApi.store('remoteBranches', remoteBranches)
         }
+        branchList = formatBranchesString({
+            localBranchesString: localBranches,
+            remoteBranchesString: remoteBranches,
+        })
     } else {
         branchList = formatBranchesString({
             localBranchesString: localBranches,
diff --git a/src/helpers/pickRemoteBranch.ts b/src/helpers/pickRemoteBranch.ts
index b14b8ad..7e3b00e 100644
--- a/src/helpers/pickRemoteBranch.ts
+++ b/src/helpers/pickRemoteBranch.ts
@@ -6,7 +6,7 @@ import childProcess from 'child_process'
 const exec = util.promisify(childProcess.exec)
 /* Interfaces */
 interface PickRemoteBranchOptions {
-    fromCache?: boolean
+    fromLocalStore?: boolean
 }
 export default async function (
     options: PickRemoteBranchOptions
@@ -17,7 +17,7 @@ export default async function (
             message: 'Which new (remote) branch would you like to check out?',
             fetchRemote: true,
             withSearch: true,
-            fromCache: options.fromCache,
+            fromLocalStore: options.fromLocalStore,
         })
 
         if (branch) {
diff --git a/src/persistantLocalStore/index.ts b/src/persistantLocalStore/index.ts
new file mode 100644
index 0000000..4c35479
--- /dev/null
+++ b/src/persistantLocalStore/index.ts
@@ -0,0 +1,26 @@
+import ConfigStore from 'configstore'
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { name } = require('../../package.json')
+const configStore = new ConfigStore(name)
+
+export interface ConfigStoreApi {
+    hasItems(): boolean
+    store(key: string, input?: string): boolean
+    get(key: string): string
+}
+const configStoreApi: ConfigStoreApi = {
+    hasItems: (): boolean => configStore.size > 0,
+    store: (key: string, input?: string): boolean => {
+        if (!input) return false
+        const preSize = configStore.size
+        configStore.set(key, input)
+        const postSize = configStore.size
+        return postSize > preSize
+    },
+    get: (key: string): string => {
+        const branchList = configStore.get(key)
+        return branchList
+    },
+}
+
+export default configStoreApi

From c8a00e6f5d3b4b81c49c9d7a42eb2e8b531228ec Mon Sep 17 00:00:00 2001
From: Thim Lohse <thimdev@gmail.com>
Date: Fri, 9 Oct 2020 23:17:45 +0200
Subject: [PATCH 5/9] removed unused mirrorkeys lib

---
 package-lock.json    | 5 -----
 package.json         | 1 -
 src/types/index.d.ts | 1 -
 3 files changed, 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1e420be..24bf2e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1180,11 +1180,6 @@
             "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
             "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
         },
-        "mirrorkey": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/mirrorkey/-/mirrorkey-1.2.0.tgz",
-            "integrity": "sha1-dcPtdLHslZUCnrEcyvHFHfYC/zw="
-        },
         "mkdirp": {
             "version": "0.5.5",
             "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
diff --git a/package.json b/package.json
index 4ff8ff8..fc20de3 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,6 @@
         "inquirer": "^7.3.3",
         "inquirer-autocomplete-prompt": "^1.2.0",
         "minimist": "^1.2.5",
-        "mirrorkey": "^1.2.0",
         "ora": "^5.1.0",
         "ramda": "^0.27.1",
         "tslib": "^2.0.1"
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index 626bb57..40cf8fe 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -1,2 +1 @@
 declare module 'inquirer-autocomplete-prompt'
-declare module 'mirrorkey'

From e92953d44c116d7ba34b31acd50da99b3f2be523 Mon Sep 17 00:00:00 2001
From: Thim Lohse <thimdev@gmail.com>
Date: Thu, 15 Oct 2020 23:48:19 +0200
Subject: [PATCH 6/9] add TTL for remote branch cache

---
 src/commands/helpHandler.ts            |  4 ++--
 src/commands/pickHandler.ts            |  2 +-
 src/entry/cli.ts                       |  4 ++--
 src/helpers/branchListPromptPromise.ts |  6 +++---
 src/helpers/getBranchList.ts           |  9 +++++----
 src/helpers/pickRemoteBranch.ts        |  4 ++--
 src/persistantLocalStore/index.ts      | 24 ++++++++++++++++++++++++
 7 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/src/commands/helpHandler.ts b/src/commands/helpHandler.ts
index 544ee5f..d36f2b5 100644
--- a/src/commands/helpHandler.ts
+++ b/src/commands/helpHandler.ts
@@ -22,8 +22,8 @@ const helpDescription: Record<string, string> = {
     pick: `
         bl pick <option>
 
-        -r, --remote ....... checkout remote branch with fuzzy search functionality
-        -c --cache ......... pick from cached list of branches of available (remote only)
+        -r, --remote ....... checkout remote branch with fuzzy search functionality (Note: will fetch from cache or fetch and automatically save most recent list in cache for 15 minutes)
+        -f --fresh ......... pick branch from fresh remote and overwrite stored list of remote branches in cache with new list (remote only)
         `,
     create: `
         bl create <option>
diff --git a/src/commands/pickHandler.ts b/src/commands/pickHandler.ts
index 7eb74d7..7e577b5 100644
--- a/src/commands/pickHandler.ts
+++ b/src/commands/pickHandler.ts
@@ -10,5 +10,5 @@ export default async (argv: ParsedArgs): Promise<void | Error> => {
     if (!argv.r) {
         return await pickLocalBranch()
     }
-    return await pickRemoteBranch({ fromLocalStore: !!argv.c })
+    return await pickRemoteBranch({ freshFetch: !!argv.f })
 }
diff --git a/src/entry/cli.ts b/src/entry/cli.ts
index 366357d..a0fbd7d 100644
--- a/src/entry/cli.ts
+++ b/src/entry/cli.ts
@@ -6,14 +6,14 @@ import { ErrorHandler } from '../handlers'
 const parseArgs = (rawArgs: string[]) =>
     minimist(rawArgs.slice(2), {
         string: ['pick', 'delete', 'create'],
-        boolean: ['version', 'help', 'multiple', 'remote', 'upstream', 'cache'],
+        boolean: ['version', 'help', 'multiple', 'remote', 'upstream', 'fresh'],
         alias: {
             v: 'version',
             h: 'help',
             m: 'multiple',
             r: 'remote',
             u: 'upstream',
-            c: 'cache',
+            f: 'fresh',
         },
     })
 
diff --git a/src/helpers/branchListPromptPromise.ts b/src/helpers/branchListPromptPromise.ts
index c4d62a7..a3118a9 100644
--- a/src/helpers/branchListPromptPromise.ts
+++ b/src/helpers/branchListPromptPromise.ts
@@ -16,7 +16,7 @@ interface BranchListPromptParams {
     multipleChoice?: boolean
     fetchRemote?: boolean
     withSearch?: boolean
-    fromLocalStore?: boolean
+    freshFetch?: boolean
 }
 export default async function ({
     message,
@@ -24,9 +24,9 @@ export default async function ({
     multipleChoice = false,
     fetchRemote = false,
     withSearch = false,
-    fromLocalStore = false,
+    freshFetch = false,
 }: BranchListPromptParams): Promise<Answers> {
-    const branchList = await getBranchList({ fetchRemote, fromLocalStore })
+    const branchList = await getBranchList({ fetchRemote, freshFetch })
 
     let questions: Question[] = []
 
diff --git a/src/helpers/getBranchList.ts b/src/helpers/getBranchList.ts
index 4ceb938..7161ca4 100644
--- a/src/helpers/getBranchList.ts
+++ b/src/helpers/getBranchList.ts
@@ -12,7 +12,7 @@ interface FormatBranchesStringOptions {
 }
 interface GetBranchListParams {
     fetchRemote?: boolean
-    fromLocalStore?: boolean
+    freshFetch?: boolean
 }
 
 interface FilterNewBranchesParams {
@@ -28,8 +28,9 @@ const gitListRemoteBranchesScript = `git fetch --prune && git branch -r`
 
 const shouldFetchFromLocalStore = (
     configStore: ConfigStoreApi,
-    fromCache?: boolean
-): boolean => configStore.hasItems() && !!fromCache
+    freshFetch?: boolean
+): boolean =>
+    !!freshFetch && configStore.hasItems() && !configStore.isLocalStorageStale
 
 const filterNewOnRemote = (parameters: FilterNewBranchesParams) => {
     const remote = new Set(parameters.remoteBranches)
@@ -71,7 +72,7 @@ export default async function (
     )?.stdout.trim()
 
     if (options?.fetchRemote) {
-        if (shouldFetchFromLocalStore(configStoreApi, options.fromLocalStore)) {
+        if (shouldFetchFromLocalStore(configStoreApi, options.freshFetch)) {
             remoteBranches = configStoreApi.get('remoteBranches')
         } else {
             remoteBranches = (
diff --git a/src/helpers/pickRemoteBranch.ts b/src/helpers/pickRemoteBranch.ts
index 7e3b00e..438d43c 100644
--- a/src/helpers/pickRemoteBranch.ts
+++ b/src/helpers/pickRemoteBranch.ts
@@ -6,7 +6,7 @@ import childProcess from 'child_process'
 const exec = util.promisify(childProcess.exec)
 /* Interfaces */
 interface PickRemoteBranchOptions {
-    fromLocalStore?: boolean
+    freshFetch?: boolean
 }
 export default async function (
     options: PickRemoteBranchOptions
@@ -17,7 +17,7 @@ export default async function (
             message: 'Which new (remote) branch would you like to check out?',
             fetchRemote: true,
             withSearch: true,
-            fromLocalStore: options.fromLocalStore,
+            freshFetch: options.freshFetch,
         })
 
         if (branch) {
diff --git a/src/persistantLocalStore/index.ts b/src/persistantLocalStore/index.ts
index 4c35479..4ffd821 100644
--- a/src/persistantLocalStore/index.ts
+++ b/src/persistantLocalStore/index.ts
@@ -1,19 +1,42 @@
 import ConfigStore from 'configstore'
+
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const { name } = require('../../package.json')
 const configStore = new ConfigStore(name)
 
+const createdAtKey = 'createdAt'
+const timeUntilLocalStorageIsStaleInMinutes = 15
+const millisecondsPerSecond = 1000
+const secondsPerMinute = 60
+const convertToMillisecondsFromMinutesMultipler =
+    millisecondsPerSecond * secondsPerMinute
+const timeUntilLocalStorageIsStaleInMilliseconds =
+    timeUntilLocalStorageIsStaleInMinutes *
+    convertToMillisecondsFromMinutesMultipler
+
 export interface ConfigStoreApi {
+    isLocalStorageStale(createdAt: number): boolean
     hasItems(): boolean
     store(key: string, input?: string): boolean
     get(key: string): string
 }
 const configStoreApi: ConfigStoreApi = {
+    isLocalStorageStale: (createdAt: number): boolean => {
+        const currentTimeInMs = Date.now()
+        const approximateTimeElapsedInMillisecondsSinceCreated = Math.floor(
+            currentTimeInMs - createdAt
+        )
+        return (
+            approximateTimeElapsedInMillisecondsSinceCreated >
+            timeUntilLocalStorageIsStaleInMilliseconds
+        )
+    },
     hasItems: (): boolean => configStore.size > 0,
     store: (key: string, input?: string): boolean => {
         if (!input) return false
         const preSize = configStore.size
         configStore.set(key, input)
+        configStore.set(createdAtKey, Date.now())
         const postSize = configStore.size
         return postSize > preSize
     },
@@ -24,3 +47,4 @@ const configStoreApi: ConfigStoreApi = {
 }
 
 export default configStoreApi
+export { createdAtKey }

From 0f14691a6a48133089d2350152f0e2f088b06233 Mon Sep 17 00:00:00 2001
From: Thim Lohse <thimdev@gmail.com>
Date: Fri, 16 Oct 2020 00:14:24 +0200
Subject: [PATCH 7/9] fix logic for conditional cache fetch

---
 src/commands/helpHandler.ts       |  6 ++++--
 src/helpers/getBranchList.ts      | 13 +++++++++----
 src/persistantLocalStore/index.ts | 16 +++++++++-------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/commands/helpHandler.ts b/src/commands/helpHandler.ts
index d36f2b5..e2ae144 100644
--- a/src/commands/helpHandler.ts
+++ b/src/commands/helpHandler.ts
@@ -22,8 +22,10 @@ const helpDescription: Record<string, string> = {
     pick: `
         bl pick <option>
 
-        -r, --remote ....... checkout remote branch with fuzzy search functionality (Note: will fetch from cache or fetch and automatically save most recent list in cache for 15 minutes)
-        -f --fresh ......... pick branch from fresh remote and overwrite stored list of remote branches in cache with new list (remote only)
+        -r, --remote ....... checkout remote branch with fuzzy search functionality 
+                             (Note: will fetch from cache or fetch and automatically save most recent list in cache for 5 minutes)
+        -f --fresh ......... pick branch from fresh remote
+                             (Note: will overwrite stored list of remote branches in cache with new list [remote only])
         `,
     create: `
         bl create <option>
diff --git a/src/helpers/getBranchList.ts b/src/helpers/getBranchList.ts
index 7161ca4..4162a8a 100644
--- a/src/helpers/getBranchList.ts
+++ b/src/helpers/getBranchList.ts
@@ -1,6 +1,9 @@
 import util from 'util'
 import { anyPass, isNil, isEmpty } from 'ramda'
-import configStoreApi, { ConfigStoreApi } from '../persistantLocalStore'
+import configStoreApi, {
+    ConfigStoreApi,
+    remoteBranchesKey,
+} from '../persistantLocalStore'
 import { NoBranchError } from '../errors'
 import childProcess from 'child_process'
 const exec = util.promisify(childProcess.exec)
@@ -30,7 +33,9 @@ const shouldFetchFromLocalStore = (
     configStore: ConfigStoreApi,
     freshFetch?: boolean
 ): boolean =>
-    !!freshFetch && configStore.hasItems() && !configStore.isLocalStorageStale
+    !freshFetch &&
+    configStore.hasSavedRemoteBranches() &&
+    !configStore.isLocalStorageStale()
 
 const filterNewOnRemote = (parameters: FilterNewBranchesParams) => {
     const remote = new Set(parameters.remoteBranches)
@@ -73,12 +78,12 @@ export default async function (
 
     if (options?.fetchRemote) {
         if (shouldFetchFromLocalStore(configStoreApi, options.freshFetch)) {
-            remoteBranches = configStoreApi.get('remoteBranches')
+            remoteBranches = configStoreApi.get(remoteBranchesKey)
         } else {
             remoteBranches = (
                 await exec(gitListRemoteBranchesScript)
             )?.stdout.trim()
-            configStoreApi.store('remoteBranches', remoteBranches)
+            configStoreApi.store(remoteBranchesKey, remoteBranches)
         }
         branchList = formatBranchesString({
             localBranchesString: localBranches,
diff --git a/src/persistantLocalStore/index.ts b/src/persistantLocalStore/index.ts
index 4ffd821..4782fd2 100644
--- a/src/persistantLocalStore/index.ts
+++ b/src/persistantLocalStore/index.ts
@@ -4,8 +4,9 @@ import ConfigStore from 'configstore'
 const { name } = require('../../package.json')
 const configStore = new ConfigStore(name)
 
+const remoteBranchesKey = 'remoteBranches'
 const createdAtKey = 'createdAt'
-const timeUntilLocalStorageIsStaleInMinutes = 15
+const timeUntilLocalStorageIsStaleInMinutes = 5
 const millisecondsPerSecond = 1000
 const secondsPerMinute = 60
 const convertToMillisecondsFromMinutesMultipler =
@@ -14,14 +15,15 @@ const timeUntilLocalStorageIsStaleInMilliseconds =
     timeUntilLocalStorageIsStaleInMinutes *
     convertToMillisecondsFromMinutesMultipler
 
-export interface ConfigStoreApi {
-    isLocalStorageStale(createdAt: number): boolean
-    hasItems(): boolean
+interface ConfigStoreApi {
+    isLocalStorageStale(): boolean
+    hasSavedRemoteBranches(): boolean
     store(key: string, input?: string): boolean
     get(key: string): string
 }
 const configStoreApi: ConfigStoreApi = {
-    isLocalStorageStale: (createdAt: number): boolean => {
+    isLocalStorageStale: (): boolean => {
+        const createdAt = configStore.get(createdAtKey) || 0
         const currentTimeInMs = Date.now()
         const approximateTimeElapsedInMillisecondsSinceCreated = Math.floor(
             currentTimeInMs - createdAt
@@ -31,7 +33,7 @@ const configStoreApi: ConfigStoreApi = {
             timeUntilLocalStorageIsStaleInMilliseconds
         )
     },
-    hasItems: (): boolean => configStore.size > 0,
+    hasSavedRemoteBranches: (): boolean => configStore.has(remoteBranchesKey),
     store: (key: string, input?: string): boolean => {
         if (!input) return false
         const preSize = configStore.size
@@ -47,4 +49,4 @@ const configStoreApi: ConfigStoreApi = {
 }
 
 export default configStoreApi
-export { createdAtKey }
+export { ConfigStoreApi, remoteBranchesKey }

From fbe91b893ce479253f7fff06f0439ea6bf8b1f39 Mon Sep 17 00:00:00 2001
From: Thim Lohse <thimdev@gmail.com>
Date: Fri, 16 Oct 2020 00:21:17 +0200
Subject: [PATCH 8/9] updated docs

---
 githubREADME.md | 16 ++++++++--------
 npmREADME.md    | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/githubREADME.md b/githubREADME.md
index 155f419..a1fc065 100644
--- a/githubREADME.md
+++ b/githubREADME.md
@@ -74,14 +74,14 @@ npm unlink
 bl [command] <option>
 ```
 
-| Command               | Description                          |
-| --------------------- | ------------------------------------ |
-| `pick`                | checkout git branch from select list |
-| `create`              | create new git branch                |
-| `delete`              | delete git branch from select list   |
-| `-v --version`        | show package version                 |
-| `-h --help`           | show help menu                       |
-| `[command] -h --help` | show help menu for specific command  |
+| Command               | Description                                            |
+| --------------------- | ------------------------------------------------------ |
+| `pick`                | checkout git branch from select list with fuzzy search |
+| `create`              | create new git branch                                  |
+| `delete`              | delete git branch from select list with fuzzy search   |
+| `-v --version`        | show package version                                   |
+| `-h --help`           | show help menu                                         |
+| `[command] -h --help` | show help menu for specific command                    |
 
 ## Demo
 
diff --git a/npmREADME.md b/npmREADME.md
index c4e0a04..12e79be 100644
--- a/npmREADME.md
+++ b/npmREADME.md
@@ -53,14 +53,14 @@ npm install -g @thimlohsedev/branch_lightyear
 bl [command] <option>
 ```
 
-| Command               | Description                          |
-| --------------------- | ------------------------------------ |
-| `pick`                | checkout git branch from select list |
-| `create`              | create new git branch                |
-| `delete`              | delete git branch from select list   |
-| `-v --version`        | show package version                 |
-| `-h --help`           | show help menu                       |
-| `[command] -h --help` | show help menu for specific command  |
+| Command               | Description                                            |
+| --------------------- | ------------------------------------------------------ |
+| `pick`                | checkout git branch from select list with fuzzy search |
+| `create`              | create new git branch                                  |
+| `delete`              | delete git branch from select list with fuzzy search   |
+| `-v --version`        | show package version                                   |
+| `-h --help`           | show help menu                                         |
+| `[command] -h --help` | show help menu for specific command                    |
 
 ## Demo
 

From c32537e0310858fea1a98c83bbd246cb83d92d9a Mon Sep 17 00:00:00 2001
From: Thim Lohse <thimdev@gmail.com>
Date: Fri, 16 Oct 2020 00:21:28 +0200
Subject: [PATCH 9/9] add caching of remote branches

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 24bf2e4..d84e5a3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "@thimlohsedev/branch_lightyear",
-    "version": "1.8.0",
+    "version": "1.9.0",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
diff --git a/package.json b/package.json
index fc20de3..4f772d5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@thimlohsedev/branch_lightyear",
-    "version": "1.8.0",
+    "version": "1.9.0",
     "description": "The comfort of some pretty sleek Git commands right in the terminal",
     "bin": {
         "@thimlohsedev/bl": "bin/branch_lightyear",