fixup! Include caching definitions in split bulk operations
fixup! Make definitions and structures truly append-only