Make (a)synchronous fetch handling less buggy