Added memory and local storage cache