So...I'm pretty sure I've used "which" in this very way before.
‘I saw a cat, which toy had black fur’ → the cat is a toy, and the cat-toy has black fur; vs ‘I saw a cat, whose toy had black fur’ → the cat has (owns, is playing with, etc.) a toy, and the cat's toy has black fur.