updated names and cleaned up redundant cache loading
1 file changed