diff --git a/server/cache_mem.go b/server/cache_mem.go
deleted file mode 100644
index cc63ff64..00000000
--- a/server/cache_mem.go
+++ /dev/null
@@ -1,189 +0,0 @@
-package server
-
-import (
-	"sort"
-	"sync"
-	"time"
-)
-
-type memCache struct {
-	messages  map[string][]*message
-	scheduled map[string]*message // Message ID -> message
-	nop       bool
-	mu        sync.Mutex
-}
-
-var _ cache = (*memCache)(nil)
-
-func (c *memCache) AddMessage(m *message) error {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	if c.nop {
-		return nil
-	}
-	if m.Event != messageEvent {
-		return errUnexpectedMessageType
-	}
-	if _, ok := c.messages[m.Topic]; !ok {
-		c.messages[m.Topic] = make([]*message, 0)
-	}
-	delayed := m.Time > time.Now().Unix()
-	if delayed {
-		c.scheduled[m.ID] = m
-	}
-	c.messages[m.Topic] = append(c.messages[m.Topic], m)
-	return nil
-}
-
-func (c *memCache) Messages(topic string, since sinceMarker, scheduled bool) ([]*message, error) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	if _, ok := c.messages[topic]; !ok || since.IsNone() {
-		return make([]*message, 0), nil
-	}
-	var messages []*message
-	if since.IsID() {
-		messages = c.messagesSinceID(topic, since, scheduled)
-	} else {
-		messages = c.messagesSinceTime(topic, since, scheduled)
-	}
-	sort.Slice(messages, func(i, j int) bool {
-		return messages[i].Time < messages[j].Time
-	})
-	return messages, nil
-}
-
-func (c *memCache) messagesSinceTime(topic string, since sinceMarker, scheduled bool) []*message {
-	messages := make([]*message, 0)
-	for _, m := range c.messages[topic] {
-		_, messageScheduled := c.scheduled[m.ID]
-		include := m.Time >= since.Time().Unix() && (!messageScheduled || scheduled)
-		if include {
-			messages = append(messages, m)
-		}
-	}
-	return messages
-}
-
-func (c *memCache) messagesSinceID(topic string, since sinceMarker, scheduled bool) []*message {
-	messages := make([]*message, 0)
-	foundID := false
-	for _, m := range c.messages[topic] {
-		_, messageScheduled := c.scheduled[m.ID]
-		if foundID {
-			if !messageScheduled || scheduled {
-				messages = append(messages, m)
-			}
-		} else if m.ID == since.ID() {
-			foundID = true
-		}
-	}
-	// Return all messages if no message was found
-	if !foundID {
-		for _, m := range c.messages[topic] {
-			_, messageScheduled := c.scheduled[m.ID]
-			if !messageScheduled || scheduled {
-				messages = append(messages, m)
-			}
-		}
-	}
-	return messages
-}
-
-func (c *memCache) maybeAppendMessage(messages []*message, m *message, since sinceMarker, scheduled bool) {
-	_, messageScheduled := c.scheduled[m.ID]
-	include := m.Time >= since.Time().Unix() && (!messageScheduled || scheduled)
-	if include {
-		messages = append(messages, m)
-	}
-}
-
-func (c *memCache) MessagesDue() ([]*message, error) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	messages := make([]*message, 0)
-	for _, m := range c.scheduled {
-		due := time.Now().Unix() >= m.Time
-		if due {
-			messages = append(messages, m)
-		}
-	}
-	sort.Slice(messages, func(i, j int) bool {
-		return messages[i].Time < messages[j].Time
-	})
-	return messages, nil
-}
-
-func (c *memCache) MarkPublished(m *message) error {
-	c.mu.Lock()
-	delete(c.scheduled, m.ID)
-	c.mu.Unlock()
-	return nil
-}
-
-func (c *memCache) MessageCount(topic string) (int, error) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	if _, ok := c.messages[topic]; !ok {
-		return 0, nil
-	}
-	return len(c.messages[topic]), nil
-}
-
-func (c *memCache) Topics() (map[string]*topic, error) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	topics := make(map[string]*topic)
-	for topic := range c.messages {
-		topics[topic] = newTopic(topic)
-	}
-	return topics, nil
-}
-
-func (c *memCache) Prune(olderThan time.Time) error {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	for topic := range c.messages {
-		c.pruneTopic(topic, olderThan)
-	}
-	return nil
-}
-
-func (c *memCache) AttachmentsSize(owner string) (int64, error) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	var size int64
-	for topic := range c.messages {
-		for _, m := range c.messages[topic] {
-			counted := m.Attachment != nil && m.Attachment.Owner == owner && m.Attachment.Expires > time.Now().Unix()
-			if counted {
-				size += m.Attachment.Size
-			}
-		}
-	}
-	return size, nil
-}
-
-func (c *memCache) AttachmentsExpired() ([]string, error) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	ids := make([]string, 0)
-	for topic := range c.messages {
-		for _, m := range c.messages[topic] {
-			if m.Attachment != nil && m.Attachment.Expires > 0 && m.Attachment.Expires < time.Now().Unix() {
-				ids = append(ids, m.ID)
-			}
-		}
-	}
-	return ids, nil
-}
-
-func (c *memCache) pruneTopic(topic string, olderThan time.Time) {
-	messages := make([]*message, 0)
-	for _, m := range c.messages[topic] {
-		if m.Time >= olderThan.Unix() {
-			messages = append(messages, m)
-		}
-	}
-	c.messages[topic] = messages
-}
diff --git a/server/cache_sqlite.go b/server/cache_sqlite.go
index beade6c8..4b53ff17 100644
--- a/server/cache_sqlite.go
+++ b/server/cache_sqlite.go
@@ -65,7 +65,7 @@ const (
 	selectMessagesSinceIDIncludeScheduledQuery = `
 		SELECT mid, time, topic, message, title, priority, tags, click, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, attachment_owner, encoding
 		FROM messages 
-		WHERE topic = ? AND id > ?
+		WHERE topic = ? AND (id > ? OR published = 0)
 		ORDER BY time, id
 	`
 	selectMessagesDueQuery = `
@@ -196,7 +196,7 @@ func newNopCache() (*sqliteCache, error) {
 	return newSqliteCache(createMemoryFilename(), true)
 }
 
-// createMemoryFilename creates a unique filename to use for the SQLite backend.
+// createMemoryFilename creates a unique memory filename to use for the SQLite backend.
 // From mattn/go-sqlite3: "Each connection to ":memory:" opens a brand new in-memory
 // sql database, so if the stdlib's sql engine happens to open another connection and
 // you've only specified ":memory:", that connection will see a brand new database.
@@ -283,6 +283,7 @@ func (c *sqliteCache) messagesSinceID(topic string, since sinceMarker, scheduled
 	if err := idrows.Scan(&rowID); err != nil {
 		return nil, err
 	}
+	idrows.Close()
 	var rows *sql.Rows
 	if scheduled {
 		rows, err = c.db.Query(selectMessagesSinceIDIncludeScheduledQuery, topic, rowID)