Fixes issues with catchFetch
Merge branch 'fixCache'