Added __DIR__ to make the class cacheable
Merge branch 'hotfix/3520'

Close #3520
Merge branch 'patch-1' of git://github.com/grizzm0/zf2 into hotfix/3445
Merge branch 'hotfix/3445' into develop

Forward port #3445