Added storefront and caching