Applied Stas's patch for caching products/packages

@labisso @timf