A Fibre Channel switch element in a Fibre Channel network is provided. The Fibre Channel switch element includes a port that replaces a logical unit number ("LUN") field value in a FCP_CMND frame. The port includes a LUN Mapping cache for replacing the LUN field value in a FCP_CMND frame. The LUN Mapping cache may also generate a value that is added to or subtracted from the LUN field value in the FCP_CMND frame. A control bit is used to activate LUN Mapping cache for mapping LUN values.