Yep - I will implement the cache in this pull request.