Fix map init
Fix test to use cache