Caching and more detailed comments