UP-4072:  Marketplace Caching (enhance Marketplace to cache sufficiently that it is performant)