Object caching fix