Updated _cache_lookup, fixed typos, ...