Fixes caching issue with fields introduced in last commit