Instead of writing separate cache cleanup checks, add them to existing ones

For now, for set only