switch (and lazily convert) ivar names to 3.x
Merge pull request #10239 from rubys/cache_entry_conversion_problems

switch (and lazily convert) ivar names to 3.x