Changed builder to reflect better top-level api
Improvements to the caching in CacheManager