Merge "Add flag for considering flags in PackageCacher" into main