Fixes issue with fieldcache