fix caching objects