use get_cached_commit_buffer where appropriate