[HV-838] Make resolved type cache not static.