NCBO-971 incremental cache updates for mappings