Back to Cache-based naming. Fixes #301