Prevent infinite recursion in invalidate

Change-Id: I8946a8572b608bf8ede211d270f797f135f8083a
Reviewed-by: John Cummings <jcummings2@users.sf.net>