wip: enhance revalidation