- caching fix