Begin caching implementation & style changes