Another TypeChangeCount caching bug fix.