Remove cache map and rely only on env variable