Which preposition to use with diagnosis?

The sentence is: "It has been 2 years since my diagnosis of/with cancer".

Which is correct, "diagnosis of" or "diagnosis with" cancer? The meaning i want is: "It has been 2 years since I was diagnosed with cancer."

My impression is that "diagnosis of" implies the speaker is the person who performed the diagnosis (i.e. the doctor), while "diagnosis with" implies the speaker was the person who was diagnosed (i.e. the patient).

Thanks,