Improved caching, beginning UI improvements