Support project_dir
, deprecate cache_dir
#758
+9
−39
Merged