fix bug
Fix some issues
Fixes, need to be careful about maps when coming out of a cache