make binary cache proper and simpler