Fix to ensure loading and saving to disk is not done on main queue