Added some more caching to the Config model