Additional caching

![Derp](http://www.reactiongifs.com/r/vyvHAj0.gif)