Update CACHE_ to CACHES settings

Fixes bug 1152545

Change-Id: I6d637fe60b83478fdf42c84786965a5b9b48a9e2
Merge "Update CACHE_ to CACHES settings"