take_cached_key, take_vault_key and add_key_label replace the code copied across the server-CDM, Widevine, PlayReady, ClearKey and MonaLisa branches.
Tracks with different KID sets still query the vaults at the same time, but wait for one licence lock and check the key cache again before they licence.