prepared for AppCache, small refinements