Fixing issue where no result is cached for 30mins