Feature/cache request lists

Not totally confident in the refactoring here, but I think overall it is an improvement?