WIP: hacking on some code to make caching easier

decreases test-kitchen run from 20m to 2m