Keep APT_DIR in cache
Improve notation