Test, fix & clarify handling of persistent buffers