source dir is being cached, explicity remove it and a few more optimizations around caching