modify stores, caches to use new configuration style