Updates Row-Height-Cache invalidation mechanism

Fixes #2387