code cleanup
Expand cacheability (for a performance boost)