Merge "Fix cache path initialization and set."