Moved CachePolicy to top-level class. Tweaked other stuff.