Refactored cached dir list in wrapper
unlink functional tests