PSR2, PHPDocs, removed Cache use statement (not used?)