And AFAICT the cached resolution isn't what fails after the fixes I've already applied