updated names and cleaned up redundant cache loading
4 files changed