Invalidate-callback now waits until operation has completed