Change `payment_cache` to accept `PaymentInfo`