Re-enabled caching and fixed some typos