Re-enabled caching. I seem to accidentially commit with caching disabled a lot. Sorry about that.