Use context managers to handle storage syncing