XX-10950: Added cache support for entity records