Don't use cache names

Ful discussion in #853