Tweak static resources
Persistent Cache optimizations
Persistent Cache optimizations
More compact code