refactor
for now just build cache