Refactor cache data sets

Rename everything, so combined help files make sense.