Added caching to "Match" entity, since this causes a lot of operations