Fixed build/cache/paths for datasource