Merge pull request #1182 from soby-mathew/sm/opt_tbbr_flush

Unify cache flush code path after image load