Added configuration caching.