Incorporate most of code review comments for pull request 1047 related to performance caching feature