Try to add a caching layer