Initial fix for "cached" results.