XX-10950: Added cache support for entity records
XX-11383:  More merge fixups