ECOM-335 Created new branch from master and put all changes from aamir-khan/ECOM-335-caching-api into this branch.
