Fix some more cases where type/signature cachers were not being used correctly.