TypeCache fix