Passed the Cache object to the Config object on construct
Other small improvements