Re-enabled caching and others category