Merge pull request #2088 from g4b0/cache-comments

Inline documentation updated