Change in ovirt-engine[master]: engine: Replace CacheWrapper with plain Map