PSR-2 compliance on cache branch