EXPED-662 : changes to skip the cache for some entity types.