change how storage/search clients get instantiated to be simpler and use context for more stuff