Fix cache store assumption

@bouk @kvs @jduff fix for the cache issue.

This should render https://github.com/Shopify/shopify/pull/11623 unnecessary.