Fix caching comments in CommentDataHandler