storage: Align implementations to compute correct metrics
It was simpler to return the correct number instead of making the in-memory returns wrong results.