added caching for comments