one thing we have lost with the switch to per_variant caching, is the commit-queue doesn't get a seeded cache from patch builds. We could find the similar variant with matching build flags to the commit queue variant and special case the commit-queue variant to use the other variants cache.