Fixed issues with cache results being used during searches