put caching option back in