Was iCloud Keychain enabled before you upgraded? Or was it forced on?
I use iCloud keychain as my password manager, just for other things.