Added additional layer of caching to improve speed and decrease CPU impact