is this something that should be included native in target invalidation?