Refactor caller decorations into with_server_connectivity