FIX: Deliberately clear partial cache blocks on flush (fixes #1383)

Move property to top of class definition