Block is incorrectly cached under some circumstances

Can confirm the changes provided by AndyD328 work. There was however an error where the Cache object was not defined. Attached is a patch with the change changes and the addition of the "use" statement

@nsalves Not sure what you changed, but your patch looks almost the same as the initial patch, just with some spaces in the comments.

Thanks!

Automatically closed - issue fixed for 2 weeks with no activity.