Remove diff machinery dependency from read-cache