cache ui refactor 80%