Caching simplification / fixes for #1272
Tweak for limit types implode