An example optical switch includes a plurality of input ports and a plurality of output ports, a cross-connect fabric having one or more inputs, one or more outputs, and a device to selectively cross-connect the inputs with the outputs. The optical switch includes an integrated fast optical switch comprising a first input, a first output, and a second output, wherein the first input is connected to a first one of the outputs of the cross-connect fabric, and wherein the integrated fast optical switch has a switching time that is less than a switching time of the cross-connect fabric to switch the first input between the first output on a path to a first output port of the plurality of output ports and the second output on a path to a second output port of the plurality of output ports.