There is a way to automatically fill/empty oil cells before the fixed version, but it's painfully late-game: GT quantum tanks can do it (found that out doing creative mode testing when I ran into the same issue). It will also consume the cells if you're emptying them, though.