Merge "Fix more type info caching bugs."