- Fix chunk type cache being cleared too early during save (#3105)