Consistent naming and use of the activate handler to delete old caches

Closes #42