Code Cleanup and moved more things to the TRConfigCache