Performance improvements for caching
Merge pull request #82 from thanujalk/master

Performance improvements for caching