Fixed TypeCache issue