diff --git a/src/trace/traceCache.js b/src/trace/traceCache.js
index 6ed047ce6a..de834db34f 100644
--- a/src/trace/traceCache.js
+++ b/src/trace/traceCache.js
@@ -1,4 +1,6 @@
 'use strict'
+var helper = require('../helpers/util')
+
 function TraceCache () {
   this.init()
 }
@@ -84,23 +86,29 @@ TraceCache.prototype.pushStoreChanges = function (index, address, key, value) {
   this.sstore[index] = {
     'address': address,
     'key': key,
-    'value': value
+    'value': value,
+    'hashedKey': helper.sha3(key)
   }
   this.storageChanges.push(index)
 }
 
-TraceCache.prototype.rebuildStorage = function (address, storage, index) {
+TraceCache.prototype.resolveStorage = function (index, address, storage) {
+  var ret = Object.assign({}, storage)
   for (var k in this.storageChanges) {
     var changesIndex = this.storageChanges[k]
     if (changesIndex > index) {
-      return storage
+      return ret
     }
     var sstore = this.sstore[changesIndex]
     if (sstore.address === address && sstore.key) {
-      storage[sstore.key] = sstore.value
+      ret[sstore.hashedKey] = {
+        hashedKey: sstore.hashedKey,
+        key: sstore.key,
+        value: sstore.value
+      }
     }
   }
-  return storage
+  return ret
 }
 
 module.exports = TraceCache
diff --git a/src/trace/traceManager.js b/src/trace/traceManager.js
index 8dfc727a94..d75e3fd4cd 100644
--- a/src/trace/traceManager.js
+++ b/src/trace/traceManager.js
@@ -74,30 +74,9 @@ TraceManager.prototype.getLength = function (callback) {
   }
 }
 
-TraceManager.prototype.getStorageAt = function (stepIndex, tx, callback, address) {
-  var check = this.checkRequestedStep(stepIndex)
-  if (check) {
-    return callback(check, null)
-  }
-  if (!address) {
-    var stoChange = util.findLowerBoundValue(stepIndex, this.traceCache.storageChanges)
-    if (stoChange === null) return callback('no storage found', null)
-    address = this.traceCache.sstore[stoChange].address
-  }
-  var self = this
-  if (this.traceRetriever.debugStorageAtAvailable()) {
-    this.traceRetriever.getStorage(tx, address, function (error, result) {
-      if (error) {
-        // TODO throws proper error when debug_storageRangeAt will be available
-        console.log(error)
-        result = {}
-      }
-      var storage = self.traceCache.rebuildStorage(address, result, stepIndex)
-      callback(null, storage)
-    })
-  } else {
-    callback(null, this.trace[stoChange].storage)
-  }
+TraceManager.prototype.resolveStorage = function (index, address, storageOrigin, callback) {
+  var storage = this.traceCache.resolveStorage(index, address, storageOrigin)
+  callback(null, storage)
 }
 
 TraceManager.prototype.getAddresses = function (callback) {
diff --git a/src/trace/traceRetriever.js b/src/trace/traceRetriever.js
index 94e86d58b3..20bf528af3 100644
--- a/src/trace/traceRetriever.js
+++ b/src/trace/traceRetriever.js
@@ -1,5 +1,4 @@
 'use strict'
-var traceHelper = require('../helpers/traceHelper')
 var util = require('../helpers/global')
 
 function TraceRetriever () {
@@ -17,32 +16,4 @@ TraceRetriever.prototype.getTrace = function (txHash, callback) {
   })
 }
 
-TraceRetriever.prototype.getStorage = function (tx, address, callback) {
-  if (traceHelper.isContractCreation(address)) {
-    callback(null, {})
-  } else {
-    if (util.web3.debug.storageRangeAt) {
-      var end = 'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff'
-      var maxSize = 10000
-      // The VM gives only a tx hash
-      // TODO: get rid of that and use the range parameters
-      util.web3.debug.storageRangeAt(tx.blockHash, tx.transactionIndex === undefined ? tx.hash : tx.transactionIndex, address, '0x0', '0x' + end, maxSize, function (error, result) {
-        if (error) {
-          callback(error)
-        } else if (result.storage) {
-          callback(null, result.storage)
-        } else {
-          callback('storage has not been provided')
-        }
-      })
-    } else {
-      callback('no storageRangeAt endpoint found')
-    }
-  }
-}
-
-TraceRetriever.prototype.debugStorageAtAvailable = function () {
-  return true
-}
-
 module.exports = TraceRetriever