Fix invalidate for cases where target models for invalidation are not self