Introduced CachedProductQuery