Better caching and comments