Instead of connecting to SWIFT on storage init, this adds an option to allow the SWIFT connection to be created only when required.