[PATCH 2/2] Make Hub.storage and Spoke.storage a property