Forecast - Fixed caching properly