Add an in memory cache to improve performance