am 704fa750: am 9b125b04: handle old-style CACHE: packages

Merge commit '704fa75024467fb4e362537f7c341eb056e283b5'

* commit '704fa75024467fb4e362537f7c341eb056e283b5':
  handle old-style CACHE: packages