Enhancement: Give caching a try