* support block revert operation in cache * #[cfg(test)] -> fn unused_sink() * swap conditions * post-merge fix