Add cache to close #2.