Cache created objects within the mapper

Change-Id: Idc7c496683ecd03ff91d9276374cef738157b094