diff --git a/package-lock.json b/package-lock.json
index 67b58a7..538f18e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "smartcache",
+  "name": "@pushrocks/smartcache",
   "version": "1.0.5",
   "lockfileVersion": 1,
   "requires": true,
@@ -14,21 +14,98 @@
         "nan": "^2.9.2"
       }
     },
-    "@gitzone/tsrun": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@gitzone/tsrun/-/tsrun-1.1.2.tgz",
-      "integrity": "sha512-EqzaSd30hGC6wz8blC148nWQzdBFgvmbfAtjpaho7JXiPRaRsgDHv+iH8f2i6Xvpy1GWD0eXCUzwZoLoNvXkJA==",
+    "@gitzone/tsbuild": {
+      "version": "2.0.22",
+      "resolved": "https://registry.npmjs.org/@gitzone/tsbuild/-/tsbuild-2.0.22.tgz",
+      "integrity": "sha512-H0rqGVUKXWgxXhkY62kF92WpbS9GSJW27jQXaoyMsQptTQN4HIYKHWZMdO4egkk0/gDmKnBjk8MXg5Rx6efItA==",
       "dev": true,
       "requires": {
-        "smartfile": "^4.2.28",
+        "@pushrocks/smartfile": "^6.0.6",
+        "@pushrocks/smartlog": "^2.0.1",
+        "@pushrocks/smartpath": "^4.0.1",
+        "@pushrocks/smartpromise": "^2.0.5",
+        "typescript": "^3.0.1"
+      },
+      "dependencies": {
+        "typescript": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz",
+          "integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==",
+          "dev": true
+        }
+      }
+    },
+    "@gitzone/tsrun": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/@gitzone/tsrun/-/tsrun-1.1.12.tgz",
+      "integrity": "sha512-DOxqOg+evoxhgbzhzH4u6LaPF+6bpMsnBVl1QQaHzKPGBlNjaIY4yJ0RsGnWMgX1hlNLvbgHtl0Ky4A2MDvyrg==",
+      "dev": true,
+      "requires": {
+        "@gitzone/tsbuild": "^2.0.22",
+        "@pushrocks/smartfile": "^6.0.6",
         "ts-node": "^7.0.0",
-        "typescript": "^2.9.1"
+        "typescript": "^3.0.1"
+      }
+    },
+    "@gitzone/tstest": {
+      "version": "1.0.15",
+      "resolved": "https://registry.npmjs.org/@gitzone/tstest/-/tstest-1.0.15.tgz",
+      "integrity": "sha512-+t5fvYK4a0JkwwH0Fokh5aOxVzrax5OjDUL4zmhBk7KFmXt7fdvcqsSNaEp9iyqC52dLiDybdAXqHYZypXTIYw==",
+      "dev": true,
+      "requires": {
+        "@gitzone/tsrun": "^1.1.12",
+        "@pushrocks/consolecolor": "^2.0.1",
+        "@pushrocks/smartfile": "^6.0.6",
+        "@pushrocks/smartlog": "^2.0.1",
+        "@pushrocks/smartpromise": "^2.0.5",
+        "@pushrocks/smartshell": "^2.0.6",
+        "@types/figures": "^2.0.0",
+        "figures": "^2.0.0"
+      },
+      "dependencies": {
+        "@gitzone/tsrun": {
+          "version": "1.1.12",
+          "resolved": "https://registry.npmjs.org/@gitzone/tsrun/-/tsrun-1.1.12.tgz",
+          "integrity": "sha512-DOxqOg+evoxhgbzhzH4u6LaPF+6bpMsnBVl1QQaHzKPGBlNjaIY4yJ0RsGnWMgX1hlNLvbgHtl0Ky4A2MDvyrg==",
+          "dev": true,
+          "requires": {
+            "@gitzone/tsbuild": "^2.0.22",
+            "@pushrocks/smartfile": "^6.0.6",
+            "ts-node": "^7.0.0",
+            "typescript": "^3.0.1"
+          }
+        },
+        "typescript": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz",
+          "integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==",
+          "dev": true
+        }
+      }
+    },
+    "@pushrocks/consolecolor": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@pushrocks/consolecolor/-/consolecolor-2.0.1.tgz",
+      "integrity": "sha512-iOFCHVeFZ2OywbdwSxVI4/wokkcLrXVdHLgvMmkNhJ220eeLgjNZWx3EJo3vNW3zq5ybCSCUIq0878djBxrWpw==",
+      "dev": true,
+      "requires": {
+        "ansi-256-colors": "^1.1.0"
+      }
+    },
+    "@pushrocks/early": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@pushrocks/early/-/early-3.0.3.tgz",
+      "integrity": "sha512-71/nwxTpqdp1glmHz4YaGusNl/XOOcPelAxC9RA6rpS/6280QyY2u4yx+mRdMrCzn7ruLYF5awbkS8llNZ94Pg==",
+      "dev": true,
+      "requires": {
+        "@pushrocks/consolecolor": "^2.0.1",
+        "@pushrocks/smartpromise": "^2.0.5"
       }
     },
     "@pushrocks/smartdelay": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@pushrocks/smartdelay/-/smartdelay-2.0.1.tgz",
-      "integrity": "sha512-olWwh2/JWfhmYdgqrR5RdSsgv1GlXBnbP+XKUrdKVk3dcCzkoqDx9lRE9NfpoCg1cUM2VMxbTVgTW9PWyexEuw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartdelay/-/smartdelay-2.0.2.tgz",
+      "integrity": "sha512-4xf6tMKwZcxBynKgXrM4SQKgeASfRvx43LUmR5DkStp26ZHAsarCXUdKJS6y8QIPygEOTOCP8we97JAcCzBuMg==",
       "requires": {
         "@pushrocks/smartpromise": "^2.0.5"
       }
@@ -42,19 +119,113 @@
         "make-error-cause": "^2.2.0"
       }
     },
+    "@pushrocks/smartfile": {
+      "version": "6.0.7",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartfile/-/smartfile-6.0.7.tgz",
+      "integrity": "sha512-mh7JkW9/59GczaUdEJajafoc9HNjs75rblBVO20k1N8yxs/ZsfgVPniEqC6eCvCpBNiM/EzU1hgqgj/mYpXU1g==",
+      "dev": true,
+      "requires": {
+        "@pushrocks/smartpath": "^4.0.1",
+        "@pushrocks/smartpromise": "^2.0.5",
+        "@pushrocks/smartrequest": "^1.1.14",
+        "@types/fs-extra": "^5.0.4",
+        "@types/vinyl": "^2.0.2",
+        "fs-extra": "^7.0.0",
+        "glob": "^7.1.2",
+        "js-yaml": "^3.10.0",
+        "vinyl-file": "^3.0.0"
+      },
+      "dependencies": {
+        "@types/fs-extra": {
+          "version": "5.0.4",
+          "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-5.0.4.tgz",
+          "integrity": "sha512-DsknoBvD8s+RFfSGjmERJ7ZOP1HI0UZRA3FSI+Zakhrc/Gy26YQsLI+m5V5DHxroHRJqCDLKJp7Hixn8zyaF7g==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*"
+          }
+        },
+        "fs-extra": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.0.tgz",
+          "integrity": "sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        }
+      }
+    },
+    "@pushrocks/smartlog": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartlog/-/smartlog-2.0.1.tgz",
+      "integrity": "sha512-GtsDTGIUF3VuWPyF8FV5dF31ZCEIcaJ56ZlvJsWxjnyJq57X25mk5/K0QAaRE9IIeHg6fORcukFomb5C+AOQrg==",
+      "dev": true,
+      "requires": {
+        "@pushrocks/smartlog-interfaces": "^1.0.9"
+      }
+    },
+    "@pushrocks/smartlog-interfaces": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartlog-interfaces/-/smartlog-interfaces-1.0.9.tgz",
+      "integrity": "sha512-0qwpomrRN0kFjmhR9m1iHYXoISoNuXtRP0Wr+JtkYyURLwKHMaW8Xoznf8MzXJptRfqufJi3Fxh5HodpPrIZUA==",
+      "dev": true
+    },
+    "@pushrocks/smartpath": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartpath/-/smartpath-4.0.1.tgz",
+      "integrity": "sha512-MaI0+uLQPCr2V3WGnbdgb0pWa9xkWyrP4qYcbsHIjeismGLbn9s3jmP/HIXU8LkgzRgaVb+BJxmZJHOwl32DyA==",
+      "dev": true
+    },
     "@pushrocks/smartpromise": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@pushrocks/smartpromise/-/smartpromise-2.0.5.tgz",
       "integrity": "sha512-9j/chLtIiNkR0MDw7Mpxg9slxAVvAQwUZuiaPYX5KpHdKxQaHLI1VZ8IN0vPhwlfgNO4i4vGXV0wB8BvSDj03g=="
     },
-    "@pushrocks/smarttime": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@pushrocks/smarttime/-/smarttime-2.0.1.tgz",
-      "integrity": "sha512-wXt0gMAQv1ix3I1ekfe4xoW440SVmYazCazDioyNZXdY0i3Hvecmr2q73rgHqcwP1he0KJBsXVpivrCOuiAQPA==",
+    "@pushrocks/smartrequest": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartrequest/-/smartrequest-1.1.14.tgz",
+      "integrity": "sha512-+sDQB4Mxvpn8BIMPUQ7TPSCKUVMln3tHC4rp4pmfEHmBQK+g1XwtNr59aMA9kEoBDMt7li1hu+1cs+SNsWt6Gw==",
+      "dev": true,
       "requires": {
-        "moment": "^2.21.0",
-        "smartdelay": "^1.0.4",
-        "smartq": "^1.1.6"
+        "@pushrocks/smartpromise": "^2.0.5",
+        "@types/form-data": "^2.2.1",
+        "form-data": "^2.3.2"
+      }
+    },
+    "@pushrocks/smartshell": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartshell/-/smartshell-2.0.6.tgz",
+      "integrity": "sha512-D48KB3DDqLfMjOXGEutqJi+v3Z4RcWacu5BJXxUwrecvd6oetbKobfmNGxeHSQPmNGb7U3ISfKwV6c5T5EZkJg==",
+      "dev": true,
+      "requires": {
+        "@pushrocks/smartpromise": "^2.0.5",
+        "@types/which": "^1.3.1",
+        "which": "^1.3.1"
+      }
+    },
+    "@pushrocks/smarttime": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smarttime/-/smarttime-2.0.2.tgz",
+      "integrity": "sha512-/gA3CRfzJldUohjxgkMj0+Stl1GNTveHoo4+Yx7sPbpvBu9uMn7hg0JlXUaZi5SxFmRTaQIPIw38ZxjG17awjg==",
+      "requires": {
+        "@pushrocks/smartpromise": "^2.0.5",
+        "moment": "^2.21.0"
+      }
+    },
+    "@pushrocks/tapbundle": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@pushrocks/tapbundle/-/tapbundle-3.0.5.tgz",
+      "integrity": "sha512-7K1y4pyJ5O8XRmnW/ADryEoniGKOW0Un6VZpxMcYTndS5AjwKhjRkAAaSQf4g/a8Ei+uk/q8csI9Twjb9KISLQ==",
+      "dev": true,
+      "requires": {
+        "@pushrocks/early": "^3.0.3",
+        "@pushrocks/smartdelay": "^2.0.2",
+        "@pushrocks/smartpromise": "^2.0.5",
+        "leakage": "^0.4.0",
+        "smartchai": "^2.0.1"
       }
     },
     "@types/chai": {
@@ -81,19 +252,25 @@
         "@types/chai": "*"
       }
     },
-    "@types/fs-extra": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-5.0.0.tgz",
-      "integrity": "sha512-qtxDULQKUenuaDLW003CgC+0T0eiAfH3BrH+vSt87GLzbz5EZ6Ox6mv9rMttvhDOatbb9nYh0E1m7ydoYwUrAg==",
+    "@types/figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha512-mcRgJ+ncKuNI+Dwac7omO18B8C8u+YBS+AU/oyLhEyjAnT3cUUThhHgZpbiIvu5ZqSvdD30BXtrqg9nxc3OKMg==",
+      "dev": true
+    },
+    "@types/form-data": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz",
+      "integrity": "sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==",
       "dev": true,
       "requires": {
         "@types/node": "*"
       }
     },
     "@types/node": {
-      "version": "10.5.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.5.2.tgz",
-      "integrity": "sha512-m9zXmifkZsMHZBOyxZWilMwmTlpC8x5Ty360JKTiXvlXZfBWYpsg9ZZvP/Ye+iZUh+Q+MxDLjItVTWIsfwz+8Q=="
+      "version": "10.7.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.7.1.tgz",
+      "integrity": "sha512-EGoI4ylB/lPOaqXqtzAyL8HcgOuCtH2hkEaLmkueOYufsTFWBn4VCvlCDC2HW8Q+9iF+QVC3sxjDKQYjHQeZ9w=="
     },
     "@types/q": {
       "version": "0.0.37",
@@ -117,6 +294,12 @@
         "@types/node": "*"
       }
     },
+    "@types/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@types/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-ZrJDWpvg75LTGX4XwuneY9s6bF3OeZcGTpoGh3zDV9ytzcHMFsRrMIaLBRJZQMBoGyKs6unBQfVdrLZiYfb1zQ==",
+      "dev": true
+    },
     "ansi-256-colors": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/ansi-256-colors/-/ansi-256-colors-1.1.0.tgz",
@@ -144,22 +327,18 @@
       "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
       "dev": true
     },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
       "dev": true
     },
-    "beautycolor": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/beautycolor/-/beautycolor-1.0.11.tgz",
-      "integrity": "sha512-Uxl/39+2uqixPzsrV+0NOHf0sJlWmsKnRTV0oz8+bfwnHPA/E+SZuh3Upn3OXobv0W7LZg5BVoLj1nkMj7m5jA==",
-      "dev": true,
-      "requires": {
-        "ansi-256-colors": "^1.1.0",
-        "typings-global": "^1.0.14"
-      }
-    },
     "bindings": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz",
@@ -251,6 +430,15 @@
         "readable-stream": "^2.3.5"
       }
     },
+    "combined-stream": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
+      "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
+      "dev": true,
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -271,14 +459,11 @@
         "type-detect": "^4.0.0"
       }
     },
-    "define-properties": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
-      "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
-      "requires": {
-        "foreach": "^2.0.5",
-        "object-keys": "^1.0.8"
-      }
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
     },
     "diff": {
       "version": "3.5.0",
@@ -286,51 +471,33 @@
       "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
       "dev": true
     },
-    "early": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/early/-/early-2.1.1.tgz",
-      "integrity": "sha1-hB4jJU6l3FTYr67ugvWrZcAO4jw=",
-      "dev": true,
-      "requires": {
-        "beautycolor": "^1.0.7",
-        "smartq": "^1.1.1",
-        "typings-global": "^1.0.16"
-      }
-    },
-    "es-abstract": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz",
-      "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
-      "requires": {
-        "es-to-primitive": "^1.1.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.1",
-        "is-callable": "^1.1.3",
-        "is-regex": "^1.0.4"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
-      "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
-      "requires": {
-        "is-callable": "^1.1.1",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.1"
-      }
-    },
     "es6-error": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
       "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
       "dev": true
     },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
     "esprima": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
       "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
       "dev": true
     },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
     "first-chunk-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz",
@@ -340,20 +507,15 @@
         "readable-stream": "^2.0.2"
       }
     },
-    "foreach": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
-    },
-    "fs-extra": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
-      "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
+    "form-data": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
+      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
+        "asynckit": "^0.4.0",
+        "combined-stream": "1.0.6",
+        "mime-types": "^2.1.12"
       }
     },
     "fs.realpath": {
@@ -362,11 +524,6 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
     "get-func-name": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
@@ -393,23 +550,6 @@
       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
       "dev": true
     },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "home": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/home/-/home-1.0.1.tgz",
-      "integrity": "sha1-lqQjzrSbmDeP9e886uBZpVf53TU=",
-      "dev": true,
-      "requires": {
-        "os-homedir": "^1.0.1"
-      }
-    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -425,29 +565,6 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
-    "is-callable": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
-      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
-    },
-    "is-date-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
-    },
-    "is-regex": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-      "requires": {
-        "has": "^1.0.1"
-      }
-    },
-    "is-symbol": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
-      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI="
-    },
     "is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
@@ -459,6 +576,12 @@
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
     },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
     "js-yaml": {
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
@@ -510,6 +633,21 @@
         "make-error": "^1.3.4"
       }
     },
+    "mime-db": {
+      "version": "1.35.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz",
+      "integrity": "sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==",
+      "dev": true
+    },
+    "mime-types": {
+      "version": "2.1.19",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz",
+      "integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==",
+      "dev": true,
+      "requires": {
+        "mime-db": "~1.35.0"
+      }
+    },
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -565,20 +703,6 @@
         "typings-global": "^1.0.6"
       }
     },
-    "object-keys": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
-      "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag=="
-    },
-    "object.getownpropertydescriptors": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
-      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
-      "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.5.1"
-      }
-    },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -588,12 +712,6 @@
         "wrappy": "1"
       }
     },
-    "os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true
-    },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -654,12 +772,6 @@
       "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
       "dev": true
     },
-    "require-reload": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/require-reload/-/require-reload-0.2.2.tgz",
-      "integrity": "sha1-KadZGEbK+RtuijzamRaD+V+NfUI=",
-      "dev": true
-    },
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -679,60 +791,6 @@
         "chai-string": "^1.4.0"
       }
     },
-    "smartdelay": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/smartdelay/-/smartdelay-1.0.4.tgz",
-      "integrity": "sha512-ab+d8ADiMMPKwrQNhoJYjmOR20VIIIxjknoEF9/PfMryic7tmvTmFrDMdcnMRohGNw/pN+4/I5dSUBdsDya7uw==",
-      "requires": {
-        "smartq": "^1.1.1",
-        "typings-global": "^1.0.16"
-      }
-    },
-    "smartfile": {
-      "version": "4.2.28",
-      "resolved": "https://registry.npmjs.org/smartfile/-/smartfile-4.2.28.tgz",
-      "integrity": "sha512-zUeAOLYftz8xLfKTs9U1NOuNPTA9jlvTQNr7lDIv84kXnr1AEpDb2Xwy1MdK1w733sBil/RkxtezrkvgRVAnNg==",
-      "dev": true,
-      "requires": {
-        "@types/fs-extra": "5.0.0",
-        "@types/vinyl": "^2.0.2",
-        "fs-extra": "^5.0.0",
-        "glob": "^7.1.2",
-        "js-yaml": "^3.10.0",
-        "require-reload": "0.2.2",
-        "smartpath": "^3.2.8",
-        "smartq": "^1.1.6",
-        "smartrequest": "^1.0.8",
-        "vinyl-file": "^3.0.0"
-      }
-    },
-    "smartpath": {
-      "version": "3.2.8",
-      "resolved": "https://registry.npmjs.org/smartpath/-/smartpath-3.2.8.tgz",
-      "integrity": "sha1-SDS9OouuIpW6rK26I8h6UBlS+UA=",
-      "dev": true,
-      "requires": {
-        "home": "^1.0.1",
-        "typings-global": "^1.0.14"
-      }
-    },
-    "smartq": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/smartq/-/smartq-1.1.8.tgz",
-      "integrity": "sha512-FURlYW/C3bLeZjJcBVyw7bxCyQoCXiXbLCZcDUKznhXHaLu35c8m33/a2H8CA0rtb82lvzN8dRLnBZAcNMzNHQ==",
-      "requires": {
-        "util.promisify": "^1.0.0"
-      }
-    },
-    "smartrequest": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/smartrequest/-/smartrequest-1.0.13.tgz",
-      "integrity": "sha512-OHrvzaxaA8Z8bJr33yxnyJF35nrWyaumsajqXm2Zkv0/2hfWO1NQAj02VVV51rLQfmtU0Hex7Nk19SoC8nOmYg==",
-      "dev": true,
-      "requires": {
-        "smartq": "^1.1.1"
-      }
-    },
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -791,19 +849,6 @@
         "strip-bom": "^2.0.0"
       }
     },
-    "tapbundle": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/tapbundle/-/tapbundle-2.0.2.tgz",
-      "integrity": "sha512-y3ulfK4GKoVkuqF2QsrwVMWLXHqXeoDEzsw/Q9ZTJumNINbx4bcWPAdg2IcTHYgJHeSdF03HiB9EbHoUTRjD9Q==",
-      "dev": true,
-      "requires": {
-        "early": "^2.1.1",
-        "leakage": "^0.4.0",
-        "smartchai": "^2.0.1",
-        "smartdelay": "^1.0.4",
-        "smartq": "^1.1.8"
-      }
-    },
     "through2": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
@@ -836,9 +881,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
-      "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz",
+      "integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==",
       "dev": true
     },
     "typings-global": {
@@ -857,15 +902,6 @@
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
-    "util.promisify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
-      "requires": {
-        "define-properties": "^1.1.2",
-        "object.getownpropertydescriptors": "^2.0.3"
-      }
-    },
     "vinyl": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
@@ -893,6 +929,15 @@
         "vinyl": "^2.0.1"
       }
     },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
diff --git a/package.json b/package.json
index 3098171..116fed6 100644
--- a/package.json
+++ b/package.json
@@ -8,19 +8,21 @@
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
-    "test": "(tsrun test/test.ts)",
-    "build": "(npmts)"
+    "test": "(tstest test/)",
+    "build": "(tsbuild)"
   },
   "devDependencies": {
-    "@gitzone/tsrun": "^1.1.2",
-    "@types/node": "^10.5.2",
-    "tapbundle": "^2.0.2"
+    "@gitzone/tsbuild": "^2.0.22",
+    "@gitzone/tsrun": "^1.1.12",
+    "@gitzone/tstest": "^1.0.15",
+    "@pushrocks/tapbundle": "^3.0.5",
+    "@types/node": "^10.7.1"
   },
   "dependencies": {
-    "@pushrocks/smartdelay": "^2.0.1",
+    "@pushrocks/smartdelay": "^2.0.2",
     "@pushrocks/smarterror": "^2.0.1",
     "@pushrocks/smartpromise": "^2.0.5",
-    "@pushrocks/smarttime": "^2.0.1",
+    "@pushrocks/smarttime": "^2.0.2",
     "nodehash": "^1.0.4"
   }
 }
diff --git a/test/test.ts b/test/test.ts
index 4e3c9f5..12bcfc4 100644
--- a/test/test.ts
+++ b/test/test.ts
@@ -1,4 +1,4 @@
-import { expect, tap } from "tapbundle";
+import { expect, tap } from "@pushrocks/tapbundle";
 import * as smartcache from "../ts/index";
 import * as smartdelay from "@pushrocks/smartdelay";