Fixed: cache break issue when base url was used