Merge "Cache stack map encoding"