fix up invalidate scheduling

Change-Id: I3c3b3d6b6c5cfc443b5e698e6188e80c6777476b