Fixes https
Reenable caching
Merge branch 'master' of github.com:abeisgreat/pxScale