Turn on caching, add support for metadata