Remove redundant cache code, rename files, tie everything in