diff --git a/.travis.yml b/.travis.yml
index b2859589b..f7d3b6597 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,7 @@ cache:
   - target/debug/build
   - target/release/deps
   - target/release/build
+  - $HOME/.cargo
 addons:
   apt:
     packages:
diff --git a/Cargo.lock b/Cargo.lock
index 05f674a69..ad2a13c92 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -175,7 +175,7 @@ dependencies = [
  "env_logger 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethash 0.9.99",
  "ethcore-util 0.9.99",
- "heapsize 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "heapsize 0.3.2 (git+https://github.com/nikvolf/heapsize)",
  "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -267,11 +267,6 @@ name = "heapsize"
 version = "0.3.2"
 source = "git+https://github.com/nikvolf/heapsize#7913872a4f928a49659df52e48dea69d8a2376bf"
 
-[[package]]
-name = "heapsize"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "hpack"
 version = "0.2.0"
diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
index d8df6455a..6eb9dec22 100644
--- a/ethcore/Cargo.toml
+++ b/ethcore/Cargo.toml
@@ -11,7 +11,7 @@ log = "0.3"
 env_logger = "0.3"
 rustc-serialize = "0.3"
 rocksdb = "0.3"
-heapsize = "0.3"
+heapsize = { git = "https://github.com/nikvolf/heapsize" }
 rust-crypto = "0.2.34"
 time = "0.1"
 ethcore-util = { path = "../util" }
@@ -27,3 +27,4 @@ jit = ["evmjit"]
 evm-debug = []
 json-tests = []
 test-heavy = []
+default = [ "heapsize/nightly" ]
diff --git a/util/Cargo.toml b/util/Cargo.toml
index ea618ed45..9e32aea06 100644
--- a/util/Cargo.toml
+++ b/util/Cargo.toml
@@ -6,6 +6,9 @@ name = "ethcore-util"
 version = "0.9.99"
 authors = ["Ethcore <admin@ethcore.io>"]
 
+[features]
+default = [ "heapsize/nightly" ]
+
 [dependencies]
 log = "0.3"
 env_logger = "0.3"