--- 'store': patch --- Fix `with_store` and `StoreCollection` changed to private in #1011