Fix racing invalidate/commit