Moved the caching stuff into a development conditional.