Added caching feature.