Consolidate the field caching a bit