Some caching improvements for cards