edit caching for new, fb, faq
merge code