Redo code to load ConfigFile first
Remove cache and add special case new method