Removed some passing of the card cache.