add caching option
remove the logging