refactor cacheable flag
remove unused code