Model caching (bug 847703)