Add some caching, for a week