Issue #1786300 by l@va: Fix caching of CSS and JS files when aggressive caching (aggregation of CSS files) is enabled