master: fixing race condition with return results from cache