Remove apk_generator's dependency on cacheDir