caching fix, minor nitpickings