Factoring out storage client