F1 is set to keep coming back to Baku for a further four years following the extension.