Update to just invalidate
Now with tests