Added caching option