Fixed bug, where caching was never used