don't mangle single dimension in sqlite filename template
Merge branch 'multi-cache' into ads