-Fix: invalidate properly on save.