updated names and cleaned up redundant cache loading
2 files changed