Fixed caching bug
Code review changes
Merge branch 'master' into jkarn_code_review