Issue #2173799 by iamEAP: Fixed Ensure block cache configuration made through the UI always override code.