Merge "Remove wrapclass from parser cache key"