Some cosmetic changes, plus support for evicting cache entries (will be used by an external object cache implementation)