This reduced the amount of code and should
make the next step, adding failure handling,
much easier.

Also changed invalidation protocol to be atomic
(or close enough).