Issue #3038440 by hctom, Dane Powell, jwilson3: Cache rebuild errors caused by suggested PSR4 include