Improved the weather caching. Fixes #6