Rename CACHDIR to CACHEDIR

Looks like it's just a typo.

Change-Id: Ia4bf1152870ba1996171f5502f1f074f11ffd446
Merge "Rename CACHDIR to CACHEDIR"