Added configuration cache