Add source_dir, public_dir settings
Brings back database cache