Improved handling of cached results