Added caching logic.