fix caching to be unique...
fix better handling if results are empty