Caching/dependency tweaks