Get rid of over-elaborate cache naming