[OLINGO-725] Improved use buffer
2 files changed