remove cache from separate file
add sorter