[Backport 2.x] Fix memory overflow caused by cache behavior (#2015)

[kotwanikunal]

Signed-off-by: Kunal Kotwani kkotwani@amazon.com (cherry picked from commit d4af93edfb45878fdb0a442f4ac07e091b5ad14b)

Description

• Backports #2015 to 2.x

Related Issues

Resolves backport for #2015

Check List

• [x] New functionality includes testing.
• [x] New functionality has been documented.
• [x] API changes companion pull request created.
• [x] Commits are signed per the DCO using --signoff.
• [x] Public documentation issue/PR created.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. For more information on following Developer Certificate of Origin and signing off your commits, please check here.