Update to new hash handling, fix to match stored certs only for the same host/port