Fixing rake keywords and metadata cache