I don't see why Cadillac Man should be put into the KTF era at all. It was written in 1989 while they were on the New Jersey, only played on shows related to that tour and never considered again afterwards.
So New Jersey era all the way