Simple fix to ensure the cache is never null