Added ability to turn off caching