Add support for including a cache in the main bundle
Change cache store to use dictionary instead of array so we can add more things easily