Issue #1596472 follow-up by tacituseu: Replace hard coded static cache of entities with cache backends