Cleaned up map some, streamlined data passing between cache list and map