Merge pull request #274 from gavincornwell/master

Caching fixes and MOBSDK-709