Improved compatibility with cache plugins