Refactor Cached Data