Fixing issues with caching and comments.