added caching only mode, general cleanup