more efficient rewriteCond
correct cache pattern
Merge branch 'master' into prod