Fix bug with multiple cached fieldsets / collections