FIX: Alter cache names to match content