Remove empty cache name restriction. Part of #517