Merge pull request #7061 from illume/upstream-0056-static-plugin-no-cache