Some caching improvements coming up in another branch