Improve make current cache line behavior
Support ${env}