Caching fixes for fields, related to #1116