move cache classes into main project