Merge "Caching View lookups at startup time"