Add Text caches esams

Change-Id: I89e2fc43c4f3a9a2efcc3bcb1a1604d387b47336
Merge "Add Text caches esams" into production