Inching slowly towards untangling the invalidation code