Caching request hashfix

Rebased version of: #719