Added simple caching option