Merge "Remove buggy b/c logic in Parser::disableCache()/updateCacheExpiry()"