[#13284] Added entitycache and enabled
Merge pull request #113 from previousnext/13284-entitycache

[#13284] Added entitycache and enabled