Minor fixes for empty caches