Add CACHE_ENDPOINT setting
Merged master into web