Merge pull request #2 from leofeyer/feature/outputFromCache-request

Clean up `feature/outputFromCache-request`
Merge remote-tracking branch 'upstream/feature/outputFromCache-request' into feature/outputFromCache-request
Remove the redundant class alias