The only issue I ran into when implementing this on Shopify side was that we need to handle `cached_has_ones` as well in this case