Wasting water waiting for hot water???

While waiting for hot water to reach the faucet, I seem to waste a lot of precious water when I'm boondocking. Has anyone installed an undersink, propane, on demand hot water heater? Or some other ...