Wording consistency between add and cache actions
first commit of remove, TODO make portable