chore: Optimize buffering logic in exec calls (#437)

chore: Optimize buffering logic in exec calls (#437) #1886