[Cache] applied @stof advices from github