In one embodiment, an optical module cage includes a first opening for slidably receiving an optical module, a second opening positioned adjacent to the first opening for slidably receiving a riding heatsink separate from the optical module or an integrated heatsink connected to the optical module, and a guide rail interposed between the first opening and the second opening, wherein the guide rail is configured to support the riding heatsink and not interfere with insertion of the integrated heatsink.