Cache backfilling values -- Related to #2019
Properly remove listeners
Merge branch 'michel_2019_blink' into next